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

Corrected AVR8 TDF EESAVE fuse bit validation, and a little refactoring

Browse Source
This commit is contained in:
Nav
2023-05-27 13:41:47 +01:00
parent b4ec41c34a
commit b39d76d1e9
2 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ use Bloom\BuildScripts\TargetDescriptionFiles\TargetDescriptionFile;
require_once __DIR__ . "/../TargetDescriptionFile.php"; require_once __DIR__ . "/../TargetDescriptionFile.php";
require_once __DIR__ . "/Signature.php"; require_once __DIR__ . "/Signature.php";
require_once __DIR__ . "/FuseBitDescriptor.php"; require_once __DIR__ . "/FuseBitsDescriptor.php";
class Avr8TargetDescriptionFile extends TargetDescriptionFile class Avr8TargetDescriptionFile extends TargetDescriptionFile
{ {
@@ -92,11 +92,6 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
public ?int $ispReadFusePollIndex = null; public ?int $ispReadFusePollIndex = null;
public ?int $ispReadLockPollIndex = null; public ?int $ispReadLockPollIndex = null;
public ?FuseBitDescriptor $dwenFuseBitDescriptor = null;
public ?FuseBitDescriptor $ocdenFuseBitDescriptor = null;
public ?FuseBitDescriptor $jtagenFuseBitDescriptor = null;
public ?FuseBitDescriptor $eesaveFuseBitDescriptor = null;
protected function init() protected function init()
{ {
parent::init(); parent::init();
@@ -254,34 +249,6 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
} }
} }
$fuseModule = $this->modulesByName['fuse'] ?? null;
if (!empty($fuseModule)) {
$fuseRegisterGroup = $fuseModule->registerGroupsMappedByName['fuse'] ?? null;
if (!empty($fuseRegisterGroup)) {
foreach ($fuseRegisterGroup->registersMappedByName as $fuseType => $fuseRegister) {
if (isset($fuseRegister->bitFieldsByName['dwen'])) {
$this->dwenFuseBitDescriptor = new FuseBitDescriptor();
$this->dwenFuseBitDescriptor->fuseType = $fuseType;
}
if (isset($fuseRegister->bitFieldsByName['ocden'])) {
$this->ocdenFuseBitDescriptor = new FuseBitDescriptor();
$this->ocdenFuseBitDescriptor->fuseType = $fuseType;
}
if (isset($fuseRegister->bitFieldsByName['jtagen'])) {
$this->jtagenFuseBitDescriptor = new FuseBitDescriptor();
$this->jtagenFuseBitDescriptor->fuseType = $fuseType;
}
if (isset($fuseRegister->bitFieldsByName['eesave'])) {
$this->eesaveFuseBitDescriptor = new FuseBitDescriptor();
$this->eesaveFuseBitDescriptor->fuseType = $fuseType;
}
}
}
}
$progAddressSpace = $this->addressSpacesById['prog'] ?? null; $progAddressSpace = $this->addressSpacesById['prog'] ?? null;
if (!empty($progAddressSpace)) { if (!empty($progAddressSpace)) {
$this->flashSize = $progAddressSpace->size; $this->flashSize = $progAddressSpace->size;
@@ -588,6 +555,42 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
} }
} }
public function getFuseBitsDescriptor(string $fuseBitName): ?FuseBitsDescriptor
{
$fuseModule = $this->modulesByName['fuse'] ?? null;
if (!empty($fuseModule)) {
$fuseRegisterGroup = $fuseModule->registerGroupsMappedByName['fuse'] ?? null;
if (empty($fuseRegisterGroup)) {
$fuseRegisterGroup = $fuseModule->registerGroupsMappedByName['nvm_fuses'] ?? null;
}
if (!empty($fuseRegisterGroup)) {
foreach ($fuseRegisterGroup->registersMappedByName as $fuseType => $fuseRegister) {
if (isset($fuseRegister->bitFieldsByName[$fuseBitName])) {
return new FuseBitsDescriptor($fuseType);
}
}
}
}
// Try the NVM module
$nvmModule = $this->modulesByName['nvm'] ?? null;
if (!empty($nvmModule)) {
$fuseRegisterGroup = $nvmModule->registerGroupsMappedByName['nvm_fuses'] ?? null;
if (!empty($fuseRegisterGroup)) {
foreach ($fuseRegisterGroup->registersMappedByName as $fuseType => $fuseRegister) {
if (isset($fuseRegister->bitFieldsByName[$fuseBitName])) {
return new FuseBitsDescriptor($fuseType);
}
}
}
}
return null;
}
public function validate(): array public function validate(): array
{ {
$failures = parent::validate(); $failures = parent::validate();
@@ -652,17 +655,18 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
$failures[] = 'Missing ispreadlock_pollindex ISP parameter.'; $failures[] = 'Missing ispreadlock_pollindex ISP parameter.';
} }
if (empty($this->dwenFuseBitDescriptor)) { $dwenFuseBitDescriptor = $this->getFuseBitsDescriptor('dwen');
if (empty($dwenFuseBitDescriptor)) {
$failures[] = 'Could not find DWEN fuse bit field for debugWire target.'; $failures[] = 'Could not find DWEN fuse bit field for debugWire target.';
} else { } else {
static $validFuseTypes = [ static $validFuseTypes = [
FuseBitDescriptor::FUSE_TYPE_LOW, FuseBitsDescriptor::FUSE_TYPE_LOW,
FuseBitDescriptor::FUSE_TYPE_HIGH, FuseBitsDescriptor::FUSE_TYPE_HIGH,
FuseBitDescriptor::FUSE_TYPE_EXTENDED, FuseBitsDescriptor::FUSE_TYPE_EXTENDED,
]; ];
if (!in_array($this->dwenFuseBitDescriptor->fuseType, $validFuseTypes)) { if (!in_array($dwenFuseBitDescriptor->fuseType, $validFuseTypes)) {
$failures[] = 'Invalid/unknown fuse byte type for DWEN fuse bit.'; $failures[] = 'Invalid/unknown fuse byte type for DWEN fuse bit.';
} }
} }
@@ -857,12 +861,12 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
in_array(Avr8TargetDescriptionFile::AVR8_PHYSICAL_INTERFACE_JTAG, $this->debugPhysicalInterfaces) in_array(Avr8TargetDescriptionFile::AVR8_PHYSICAL_INTERFACE_JTAG, $this->debugPhysicalInterfaces)
&& $this->family == self::AVR8_FAMILY_MEGA && $this->family == self::AVR8_FAMILY_MEGA
) { ) {
if (empty($this->ocdenFuseBitDescriptor)) { if (empty($this->getFuseBitsDescriptor('ocden'))) {
$failures[] = 'Could not find OCDEN fuse bit field for JTAG target.'; $failures[] = 'Could not find OCDEN fuse bit field for JTAG target.';
} }
if (empty($this->jtagenFuseBitDescriptor)) { if (empty($this->getFuseBitsDescriptor('jtagen'))) {
$failures[] = 'Could not find JTAGEN fuse bit field for JTAG target.'; $failures[] = 'Could not find JTAGEN fuse bit field for JTAG target.';
} }
@@ -872,7 +876,7 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
in_array(Avr8TargetDescriptionFile::AVR8_PHYSICAL_INTERFACE_JTAG, $this->debugPhysicalInterfaces) in_array(Avr8TargetDescriptionFile::AVR8_PHYSICAL_INTERFACE_JTAG, $this->debugPhysicalInterfaces)
|| in_array(Avr8TargetDescriptionFile::AVR8_PHYSICAL_INTERFACE_UPDI, $this->debugPhysicalInterfaces) || in_array(Avr8TargetDescriptionFile::AVR8_PHYSICAL_INTERFACE_UPDI, $this->debugPhysicalInterfaces)
) { ) {
if (empty($this->eesaveFuseBitDescriptor)) { if (empty($this->getFuseBitsDescriptor('eesave'))) {
$failures[] = 'Could not find EESAVE fuse bit field for JTAG/UPDI target.'; $failures[] = 'Could not find EESAVE fuse bit field for JTAG/UPDI target.';
} }
} }

7
build/scripts/TargetDescriptionFiles/AVR8/FuseBitDescriptor.php → build/scripts/TargetDescriptionFiles/AVR8/FuseBitsDescriptor.php
View File

@@ -1,11 +1,16 @@
<?php <?php
namespace Bloom\BuildScripts\TargetDescriptionFiles\Avr8; namespace Bloom\BuildScripts\TargetDescriptionFiles\Avr8;
class FuseBitDescriptor class FuseBitsDescriptor
{ {
const FUSE_TYPE_LOW = 'low'; const FUSE_TYPE_LOW = 'low';
const FUSE_TYPE_HIGH = 'high'; const FUSE_TYPE_HIGH = 'high';
const FUSE_TYPE_EXTENDED = 'extended'; const FUSE_TYPE_EXTENDED = 'extended';
public ?string $fuseType = null; public ?string $fuseType = null;
public function __construct(?string $fuseType)
{
$this->fuseType = $fuseType;
}
} }