From bff9f7c317c6912b10caf72b645eedd8b8f17268 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 5 Jun 2021 22:37:54 +0100
Subject: [PATCH] Mopping up some TDF refactoring

---
 src/Targets/Microchip/AVR/AVR8/Avr8.cpp       | 34 +++++++++----------
 .../TargetDescriptionFile.cpp                 |  1 -
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
index f0aa97af..535b12c9 100644
--- a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
+++ b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
@@ -405,45 +405,45 @@ TargetParameters& Avr8::getTargetParameters() {
         }
 
         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")) {
-                this->targetParameters->appSectionPdiOffset = tdiInterfaceProperties
+            if (pdiInterfaceProperties.contains("app_section_offset")) {
+                this->targetParameters->appSectionPdiOffset = pdiInterfaceProperties
                     .at("app_section_offset").value.toInt(nullptr, 16);
             }
 
-            if (tdiInterfaceProperties.contains("boot_section_offset")) {
-                this->targetParameters->bootSectionPdiOffset = tdiInterfaceProperties
+            if (pdiInterfaceProperties.contains("boot_section_offset")) {
+                this->targetParameters->bootSectionPdiOffset = pdiInterfaceProperties
                     .at("boot_section_offset").value.toInt(nullptr, 16);
             }
 
-            if (tdiInterfaceProperties.contains("datamem_offset")) {
-                this->targetParameters->ramPdiOffset = tdiInterfaceProperties
+            if (pdiInterfaceProperties.contains("datamem_offset")) {
+                this->targetParameters->ramPdiOffset = pdiInterfaceProperties
                     .at("datamem_offset").value.toInt(nullptr, 16);
             }
 
-            if (tdiInterfaceProperties.contains("eeprom_offset")) {
-                this->targetParameters->eepromPdiOffset = tdiInterfaceProperties
+            if (pdiInterfaceProperties.contains("eeprom_offset")) {
+                this->targetParameters->eepromPdiOffset = pdiInterfaceProperties
                     .at("eeprom_offset").value.toInt(nullptr, 16);
             }
 
-            if (tdiInterfaceProperties.contains("user_signatures_offset")) {
-                this->targetParameters->userSignaturesPdiOffset = tdiInterfaceProperties
+            if (pdiInterfaceProperties.contains("user_signatures_offset")) {
+                this->targetParameters->userSignaturesPdiOffset = pdiInterfaceProperties
                     .at("user_signatures_offset").value.toInt(nullptr, 16);
             }
 
-            if (tdiInterfaceProperties.contains("prod_signatures_offset")) {
-                this->targetParameters->productSignaturesPdiOffset = tdiInterfaceProperties
+            if (pdiInterfaceProperties.contains("prod_signatures_offset")) {
+                this->targetParameters->productSignaturesPdiOffset = pdiInterfaceProperties
                     .at("prod_signatures_offset").value.toInt(nullptr, 16);
             }
 
-            if (tdiInterfaceProperties.contains("fuse_registers_offset")) {
-                this->targetParameters->fuseRegistersPdiOffset = tdiInterfaceProperties
+            if (pdiInterfaceProperties.contains("fuse_registers_offset")) {
+                this->targetParameters->fuseRegistersPdiOffset = pdiInterfaceProperties
                     .at("fuse_registers_offset").value.toInt(nullptr, 16);
             }
 
-            if (tdiInterfaceProperties.contains("lock_registers_offset")) {
-                this->targetParameters->lockRegistersPdiOffset = tdiInterfaceProperties
+            if (pdiInterfaceProperties.contains("lock_registers_offset")) {
+                this->targetParameters->lockRegistersPdiOffset = pdiInterfaceProperties
                     .at("lock_registers_offset").value.toInt(nullptr, 16);
             }
 
diff --git a/src/Targets/TargetDescription/TargetDescriptionFile.cpp b/src/Targets/TargetDescription/TargetDescriptionFile.cpp
index 20bc966d..6ea6d943 100644
--- a/src/Targets/TargetDescription/TargetDescriptionFile.cpp
+++ b/src/Targets/TargetDescription/TargetDescriptionFile.cpp
@@ -463,7 +463,6 @@ std::optional<MemorySegment> TargetDescriptionFile::getFirstBootSectionMemorySeg
 
         if (programMemorySegments.find(MemorySegmentType::FLASH) != programMemorySegments.end()) {
             auto& flashMemorySegments = programMemorySegments.find(MemorySegmentType::FLASH)->second;
-            auto firstBootSectionSegmentIt = flashMemorySegments.find("boot_section_1");
 
             if (flashMemorySegments.contains("boot_section_1")) {
                 return flashMemorySegments.at("boot_section_1");