scripts: west_commands: runners: nrf_common: adjust json output
Make the generated json file match the contents generated with: * nrfutil device erase --uicr --core Application --x-operation-id 1 --x-family nrf54h --x-append-batch batch.json * nrfutil device program --firmware uicr_merged.hex --options chip_erase_mode=ERASE_NONE,verify=VERIFY_READ --core Application --x-operation-id 2 --x-family nrf54h --x-append-batch batch.json * nrfutil device reset --reset-kind RESET_PIN --x-operation-id 3 --x-append-batch batch.json The erase options are supposed to be placed under "option" subkey. Without the "option" subkey, nrfutil defaulted to ERASE_ALL. Remove the firmware file format field because it is auto detected by nrfutil when executing the batch script. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
This commit is contained in:
parent
924db97724
commit
88dc03618b
1 changed files with 5 additions and 5 deletions
|
@ -263,14 +263,14 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
|
|||
if self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP'):
|
||||
if not self.erase and self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR'):
|
||||
self.exec_op('erase', core='NRFDL_DEVICE_CORE_APPLICATION',
|
||||
chip_erase_mode='ERASE_UICR',
|
||||
qspi_erase_mode='ERASE_NONE')
|
||||
option={'chip_erase_mode': 'ERASE_UICR',
|
||||
'qspi_erase_mode': 'ERASE_NONE'})
|
||||
core = 'NRFDL_DEVICE_CORE_APPLICATION'
|
||||
elif self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD'):
|
||||
if not self.erase and self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR'):
|
||||
self.exec_op('erase', core='NRFDL_DEVICE_CORE_NETWORK',
|
||||
chip_erase_mode='ERASE_UICR',
|
||||
qspi_erase_mode='ERASE_NONE')
|
||||
option={'chip_erase_mode': 'ERASE_UICR',
|
||||
'qspi_erase_mode': 'ERASE_NONE'})
|
||||
core = 'NRFDL_DEVICE_CORE_NETWORK'
|
||||
else:
|
||||
if self.erase:
|
||||
|
@ -383,7 +383,7 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
|
|||
''' Ensure the tool is installed '''
|
||||
|
||||
def op_program(self, hex_file, erase, qspi_erase, defer=False, core=None):
|
||||
args = {'firmware': {'file': hex_file, 'format': 'NRFDL_FW_INTEL_HEX'},
|
||||
args = {'firmware': {'file': hex_file},
|
||||
'chip_erase_mode': erase, 'verify': 'VERIFY_READ'}
|
||||
if qspi_erase:
|
||||
args['qspi_erase_mode'] = qspi_erase
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue