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

Mopping up some TDF refactoring

Browse Source
This commit is contained in:
Nav
2021-06-05 22:37:54 +01:00
parent 9a31bddd06
commit bff9f7c317
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Targets/Microchip/AVR/AVR8/Avr8.cpp
View File

@@ -405,45 +405,45 @@ TargetParameters& Avr8::getTargetParameters() {
} }
if (propertyGroups.contains("pdi_interface")) { if (propertyGroups.contains("pdi_interface")) {
auto& tdiInterfaceProperties = propertyGroups.at("pdi_interface").propertiesMappedByName; auto& pdiInterfaceProperties = propertyGroups.at("pdi_interface").propertiesMappedByName;
if (tdiInterfaceProperties.contains("app_section_offset")) { if (pdiInterfaceProperties.contains("app_section_offset")) {
this->targetParameters->appSectionPdiOffset = tdiInterfaceProperties this->targetParameters->appSectionPdiOffset = pdiInterfaceProperties
.at("app_section_offset").value.toInt(nullptr, 16); .at("app_section_offset").value.toInt(nullptr, 16);
} }
if (tdiInterfaceProperties.contains("boot_section_offset")) { if (pdiInterfaceProperties.contains("boot_section_offset")) {
this->targetParameters->bootSectionPdiOffset = tdiInterfaceProperties this->targetParameters->bootSectionPdiOffset = pdiInterfaceProperties
.at("boot_section_offset").value.toInt(nullptr, 16); .at("boot_section_offset").value.toInt(nullptr, 16);
} }
if (tdiInterfaceProperties.contains("datamem_offset")) { if (pdiInterfaceProperties.contains("datamem_offset")) {
this->targetParameters->ramPdiOffset = tdiInterfaceProperties this->targetParameters->ramPdiOffset = pdiInterfaceProperties
.at("datamem_offset").value.toInt(nullptr, 16); .at("datamem_offset").value.toInt(nullptr, 16);
} }
if (tdiInterfaceProperties.contains("eeprom_offset")) { if (pdiInterfaceProperties.contains("eeprom_offset")) {
this->targetParameters->eepromPdiOffset = tdiInterfaceProperties this->targetParameters->eepromPdiOffset = pdiInterfaceProperties
.at("eeprom_offset").value.toInt(nullptr, 16); .at("eeprom_offset").value.toInt(nullptr, 16);
} }
if (tdiInterfaceProperties.contains("user_signatures_offset")) { if (pdiInterfaceProperties.contains("user_signatures_offset")) {
this->targetParameters->userSignaturesPdiOffset = tdiInterfaceProperties this->targetParameters->userSignaturesPdiOffset = pdiInterfaceProperties
.at("user_signatures_offset").value.toInt(nullptr, 16); .at("user_signatures_offset").value.toInt(nullptr, 16);
} }
if (tdiInterfaceProperties.contains("prod_signatures_offset")) { if (pdiInterfaceProperties.contains("prod_signatures_offset")) {
this->targetParameters->productSignaturesPdiOffset = tdiInterfaceProperties this->targetParameters->productSignaturesPdiOffset = pdiInterfaceProperties
.at("prod_signatures_offset").value.toInt(nullptr, 16); .at("prod_signatures_offset").value.toInt(nullptr, 16);
} }
if (tdiInterfaceProperties.contains("fuse_registers_offset")) { if (pdiInterfaceProperties.contains("fuse_registers_offset")) {
this->targetParameters->fuseRegistersPdiOffset = tdiInterfaceProperties this->targetParameters->fuseRegistersPdiOffset = pdiInterfaceProperties
.at("fuse_registers_offset").value.toInt(nullptr, 16); .at("fuse_registers_offset").value.toInt(nullptr, 16);
} }
if (tdiInterfaceProperties.contains("lock_registers_offset")) { if (pdiInterfaceProperties.contains("lock_registers_offset")) {
this->targetParameters->lockRegistersPdiOffset = tdiInterfaceProperties this->targetParameters->lockRegistersPdiOffset = pdiInterfaceProperties
.at("lock_registers_offset").value.toInt(nullptr, 16); .at("lock_registers_offset").value.toInt(nullptr, 16);
} }

1
src/Targets/TargetDescription/TargetDescriptionFile.cpp
View File

@@ -463,7 +463,6 @@ std::optional<MemorySegment> TargetDescriptionFile::getFirstBootSectionMemorySeg
if (programMemorySegments.find(MemorySegmentType::FLASH) != programMemorySegments.end()) { if (programMemorySegments.find(MemorySegmentType::FLASH) != programMemorySegments.end()) {
auto& flashMemorySegments = programMemorySegments.find(MemorySegmentType::FLASH)->second; auto& flashMemorySegments = programMemorySegments.find(MemorySegmentType::FLASH)->second;
auto firstBootSectionSegmentIt = flashMemorySegments.find("boot_section_1");
if (flashMemorySegments.contains("boot_section_1")) { if (flashMemorySegments.contains("boot_section_1")) {
return flashMemorySegments.at("boot_section_1"); return flashMemorySegments.at("boot_section_1");