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

Corrected TDF data extraction for EDBG parameters in TDF scripts

Browse Source
This commit is contained in:
Nav
2024-03-25 18:55:53 +00:00
parent cf99e3e6fa
commit 0056d56904
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
View File

@@ -132,9 +132,12 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
if ($eepromAddressRegister instanceof TargetRegister) { if ($eepromAddressRegister instanceof TargetRegister) {
$output->eepromAddressRegisterLow = $eepromAddressRegister->address; $output->eepromAddressRegisterLow = $eepromAddressRegister->address;
$output->eepromAddressRegisterHigh = ($eepromAddressRegister->size == 2) $output->eepromAddressRegisterHigh = $eepromAddressRegister->size > 1
? $eepromAddressRegister->address + 1 ? $eepromAddressRegister->address !== null
: $eepromAddressRegister->address; ? $eepromAddressRegister->address >> 2
: null
: $eepromAddressRegister->address
;
} else { } else {
$eepromAddressRegisterLow = $eepromPeripheral->getRegister('eeprom', 'eearl'); $eepromAddressRegisterLow = $eepromPeripheral->getRegister('eeprom', 'eearl');
@@ -142,7 +145,11 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
if ($eepromAddressRegisterLow instanceof TargetRegister) { if ($eepromAddressRegisterLow instanceof TargetRegister) {
$output->eepromAddressRegisterLow = $eepromAddressRegisterLow->address; $output->eepromAddressRegisterLow = $eepromAddressRegisterLow->address;
$output->eepromAddressRegisterHigh = $eepromAddressRegisterLow->address; $output->eepromAddressRegisterHigh = $eepromAddressRegisterLow->size > 1
? $eepromAddressRegisterLow->address !== null
? $eepromAddressRegisterLow->address >> 2
: null
: $eepromAddressRegisterLow->address;
} }
if ($eepromAddressRegisterHigh instanceof TargetRegister) { if ($eepromAddressRegisterHigh instanceof TargetRegister) {
@@ -276,9 +283,12 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
if ($eepromAddressRegister instanceof TargetRegister) { if ($eepromAddressRegister instanceof TargetRegister) {
$output->eepromAddressRegisterLow = $eepromAddressRegister->address; $output->eepromAddressRegisterLow = $eepromAddressRegister->address;
$output->eepromAddressRegisterHigh = ($eepromAddressRegister->size == 2) $output->eepromAddressRegisterHigh = $eepromAddressRegister->size > 1
? $eepromAddressRegister->address + 1 ? $eepromAddressRegister->address !== null
: $eepromAddressRegister->address; ? $eepromAddressRegister->address >> 2
: null
: $eepromAddressRegister->address
;
} else { } else {
$eepromAddressRegisterLow = $eepromPeripheral->getRegister('eeprom', 'eearl'); $eepromAddressRegisterLow = $eepromPeripheral->getRegister('eeprom', 'eearl');
@@ -286,7 +296,6 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
if ($eepromAddressRegisterLow instanceof TargetRegister) { if ($eepromAddressRegisterLow instanceof TargetRegister) {
$output->eepromAddressRegisterLow = $eepromAddressRegisterLow->address; $output->eepromAddressRegisterLow = $eepromAddressRegisterLow->address;
$output->eepromAddressRegisterHigh = $eepromAddressRegisterLow->address;
} }
if ($eepromAddressRegisterHigh instanceof TargetRegister) { if ($eepromAddressRegisterHigh instanceof TargetRegister) {
@@ -435,26 +444,38 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
); );
$signatureMemorySegment = $this->getMemorySegment( $signatureMemorySegment = $this->getMemorySegment(
'signatures',
'signatures'
) ?? $this->getMemorySegment(
'data', 'data',
'signatures' 'signatures'
); );
if ($signatureMemorySegment instanceof MemorySegment) { if ($signatureMemorySegment instanceof MemorySegment) {
$output->signatureSegmentStartAddress = $signatureMemorySegment->startAddress; $output->signatureSegmentStartAddress = $signatureMemorySegment->startAddress;
} }
$fuseMemorySegment = $this->getMemorySegment( $fuseMemorySegment = $this->getMemorySegment(
'fuses',
'fuses'
) ?? $this->getMemorySegment(
'data', 'data',
'fuses' 'fuses'
); );
if ($fuseMemorySegment instanceof MemorySegment) { if ($fuseMemorySegment instanceof MemorySegment) {
$output->fuseSegmentSize = $fuseMemorySegment->size; $output->fuseSegmentSize = $fuseMemorySegment->size;
$output->fuseSegmentStartAddress = $fuseMemorySegment->startAddress; $output->fuseSegmentStartAddress = $fuseMemorySegment->startAddress;
} }
$lockbitsMemorySegment = $this->getMemorySegment( $lockbitsMemorySegment = $this->getMemorySegment(
'lockbits',
'lockbits'
) ?? $this->getMemorySegment(
'data', 'data',
'lockbits' 'lockbits'
); );
if ($lockbitsMemorySegment instanceof MemorySegment) { if ($lockbitsMemorySegment instanceof MemorySegment) {
$output->lockbitsSegmentStartAddress = $lockbitsMemorySegment->startAddress; $output->lockbitsSegmentStartAddress = $lockbitsMemorySegment->startAddress;
} }
@@ -495,8 +516,8 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
private function getEepromSegment(): ?MemorySegment private function getEepromSegment(): ?MemorySegment
{ {
return $this->getMemorySegment('data', 'internal_eeprom') return $this->getMemorySegment('eeprom', 'internal_eeprom')
?? $this->getMemorySegment('eeprom', 'internal_eeprom'); ?? $this->getMemorySegment('data', 'internal_eeprom');
} }
private function getBootSectionOptions(): array private function getBootSectionOptions(): array