doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for flash page writes on UPDI targets, in the EDBG driver

Browse Source
This commit is contained in:
Nav
2025-02-01 23:04:02 +00:00
parent b77c49c49b
commit 70ec49c7ac
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DebugToolDrivers/Microchip/Protocols/Edbg/Avr/Avr8Generic.hpp
View File

@@ -165,6 +165,8 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
APPL_FLASH = 0xC0, APPL_FLASH = 0xC0,
BOOT_FLASH = 0xC1, BOOT_FLASH = 0xC1,
APPL_FLASH_ATOMIC = 0xC2,
/** /**
* The SPM memory type can be used to read memory from the target whilst in debugging mode. * The SPM memory type can be used to read memory from the target whilst in debugging mode.
* *

15
src/DebugToolDrivers/Microchip/Protocols/Edbg/Avr/EdbgAvr8Interface.cpp
View File

@@ -759,6 +759,10 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
} }
} }
if (this->session.configVariant == Avr8ConfigVariant::UPDI) {
return this->writeMemory(Avr8MemoryType::APPL_FLASH_ATOMIC, startAddress, buffer);
}
return this->writeMemory(Avr8MemoryType::FLASH_PAGE, startAddress, buffer); return this->writeMemory(Avr8MemoryType::FLASH_PAGE, startAddress, buffer);
} }
@@ -1516,6 +1520,7 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
memoryType == Avr8MemoryType::FLASH_PAGE memoryType == Avr8MemoryType::FLASH_PAGE
|| memoryType == Avr8MemoryType::SPM || memoryType == Avr8MemoryType::SPM
|| memoryType == Avr8MemoryType::APPL_FLASH || memoryType == Avr8MemoryType::APPL_FLASH
|| memoryType == Avr8MemoryType::APPL_FLASH_ATOMIC
|| memoryType == Avr8MemoryType::BOOT_FLASH || memoryType == Avr8MemoryType::BOOT_FLASH
|| memoryType == Avr8MemoryType::EEPROM_ATOMIC || memoryType == Avr8MemoryType::EEPROM_ATOMIC
|| memoryType == Avr8MemoryType::EEPROM_PAGE || memoryType == Avr8MemoryType::EEPROM_PAGE
@@ -1529,6 +1534,7 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
case Avr8MemoryType::FLASH_PAGE: case Avr8MemoryType::FLASH_PAGE:
case Avr8MemoryType::SPM: case Avr8MemoryType::SPM:
case Avr8MemoryType::APPL_FLASH: case Avr8MemoryType::APPL_FLASH:
case Avr8MemoryType::APPL_FLASH_ATOMIC:
case Avr8MemoryType::BOOT_FLASH: { case Avr8MemoryType::BOOT_FLASH: {
/* /*
* Although the EDBG documentation claims any number of bytes can be accessed via the FLASH_PAGE mem * Although the EDBG documentation claims any number of bytes can be accessed via the FLASH_PAGE mem
@@ -1565,6 +1571,7 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
case Avr8MemoryType::FLASH_PAGE: case Avr8MemoryType::FLASH_PAGE:
case Avr8MemoryType::SPM: case Avr8MemoryType::SPM:
case Avr8MemoryType::APPL_FLASH: case Avr8MemoryType::APPL_FLASH:
case Avr8MemoryType::APPL_FLASH_ATOMIC:
case Avr8MemoryType::BOOT_FLASH: { case Avr8MemoryType::BOOT_FLASH: {
// See comment in EdbgAvr8Interface::alignMemoryAddress() // See comment in EdbgAvr8Interface::alignMemoryAddress()
alignTo = static_cast<std::uint16_t>(this->session.programMemorySegment.pageSize.value()); alignTo = static_cast<std::uint16_t>(this->session.programMemorySegment.pageSize.value());
@@ -1593,6 +1600,7 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
if ( if (
memoryType == Avr8MemoryType::FLASH_PAGE memoryType == Avr8MemoryType::FLASH_PAGE
|| memoryType == Avr8MemoryType::APPL_FLASH || memoryType == Avr8MemoryType::APPL_FLASH
|| memoryType == Avr8MemoryType::APPL_FLASH_ATOMIC
|| memoryType == Avr8MemoryType::BOOT_FLASH || memoryType == Avr8MemoryType::BOOT_FLASH
|| (memoryType == Avr8MemoryType::SPM && this->session.configVariant == Avr8ConfigVariant::MEGAJTAG) || (memoryType == Avr8MemoryType::SPM && this->session.configVariant == Avr8ConfigVariant::MEGAJTAG)
) { ) {
@@ -1766,7 +1774,12 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
* We can't just forward the memory type to readMemory(), because some memory types (such as * We can't just forward the memory type to readMemory(), because some memory types (such as
* EEPROM_ATOMIC) can only be used for writing. * EEPROM_ATOMIC) can only be used for writing.
*/ */
const auto readMemType = type == Avr8MemoryType::EEPROM_ATOMIC ? Avr8MemoryType::EEPROM : type; const auto readMemType = type == Avr8MemoryType::EEPROM_ATOMIC
? Avr8MemoryType::EEPROM
: type == Avr8MemoryType::APPL_FLASH_ATOMIC
? Avr8MemoryType::FLASH_PAGE
: type;
auto alignedBuffer = (alignedStartAddress < startAddress) auto alignedBuffer = (alignedStartAddress < startAddress)
? this->readMemory(readMemType, alignedStartAddress, startAddress - alignedStartAddress) ? this->readMemory(readMemType, alignedStartAddress, startAddress - alignedStartAddress)
: TargetMemoryBuffer{}; : TargetMemoryBuffer{};