michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: west_commands: runners: nrf_common: optional UICR cleanup

Browse source 
The flasher was unconditionally cleaning the UICR area, even when the
application didn't have a new configuration generated. This can happen,
when CONFIG_NRF_REGTOOL_GENERATE_UICR=n. In such case, keep the old UICR
configuration on the device.

A real scenario where we should set CONFIG_NRF_REGTOOL_GENERATE_UICR=n
is when building multiple firmware images that are meant to run one
domain. The primary application build generates the UICR configuration
and secondary images don't. Before this change, the flashing process of
the primary application would write new UICR configuration, but the
flashing process of secondary images would erase it.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
This commit is contained in:
Rafał Kuźnia 2024-05-28 11:43:42 +02:00 • committed by Fabio Baltieri
commit 64bf17daad
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/west_commands/runners/nrf_common.py
View file

@ -261,13 +261,13 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
self.exec_op('erase', core='NRFDL_DEVICE_CORE_NETWORK')
if self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP'):
if not self.erase:
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')
core = 'NRFDL_DEVICE_CORE_APPLICATION'
elif self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD'):
if not self.erase:
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')