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

Adjusted TDF validation scripts to properly handle targets that support numerous physical interfaces (for debugging)

Browse Source
This commit is contained in:
Nav
2021-06-06 00:08:03 +01:00
parent 20e16efadd
commit b78fef4efe
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
build/scripts/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
View File

@@ -18,7 +18,7 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
const AVR8_PHYSICAL_INTERFACE_DEBUG_WIRE = 'debugWire'; const AVR8_PHYSICAL_INTERFACE_DEBUG_WIRE = 'debugWire';
public ?string $family = null; public ?string $family = null;
public ?string $debugPhysicalInterface = null; public array $debugPhysicalInterface = [];
// Target params // Target params
public ?int $bootSectionStartAddress = null; public ?int $bootSectionStartAddress = null;
@@ -83,16 +83,18 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
} }
if (isset($this->physicalInterfacesByName['debugwire'])) { if (isset($this->physicalInterfacesByName['debugwire'])) {
$this->debugPhysicalInterface = self::AVR8_PHYSICAL_INTERFACE_DEBUG_WIRE; $this->debugPhysicalInterface[] = self::AVR8_PHYSICAL_INTERFACE_DEBUG_WIRE;
}
} else if (isset($this->physicalInterfacesByName['jtag'])) { if (isset($this->physicalInterfacesByName['updi'])) {
$this->debugPhysicalInterface = self::AVR8_PHYSICAL_INTERFACE_JTAG; $this->debugPhysicalInterface[] = self::AVR8_PHYSICAL_INTERFACE_UPDI;
} else if (isset($this->physicalInterfacesByName['updi'])) {
$this->debugPhysicalInterface = self::AVR8_PHYSICAL_INTERFACE_UPDI;
} else if (isset($this->physicalInterfacesByName['pdi'])) { } else if (isset($this->physicalInterfacesByName['pdi'])) {
$this->debugPhysicalInterface = self::AVR8_PHYSICAL_INTERFACE_PDI; $this->debugPhysicalInterface[] = self::AVR8_PHYSICAL_INTERFACE_PDI;
}
if (isset($this->physicalInterfacesByName['jtag'])) {
$this->debugPhysicalInterface[] = self::AVR8_PHYSICAL_INTERFACE_JTAG;
} }
$progAddressSpace = $this->addressSpacesById['prog'] ?? null; $progAddressSpace = $this->addressSpacesById['prog'] ?? null;
@@ -371,8 +373,11 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
$failures[] = 'Missing eeprom page size.'; $failures[] = 'Missing eeprom page size.';
} }
if ($this->debugPhysicalInterface == self::AVR8_PHYSICAL_INTERFACE_JTAG if (in_array(self::AVR8_PHYSICAL_INTERFACE_DEBUG_WIRE, $this->debugPhysicalInterface)
|| $this->debugPhysicalInterface == self::AVR8_PHYSICAL_INTERFACE_DEBUG_WIRE || (
in_array(self::AVR8_PHYSICAL_INTERFACE_JTAG, $this->debugPhysicalInterface)
&& $this->family == self::AVR8_FAMILY_MEGA
)
) { ) {
if (is_null($this->ocdRevision)) { if (is_null($this->ocdRevision)) {
$failures[] = 'Missing OCD revision.'; $failures[] = 'Missing OCD revision.';