michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: nrf_common: Move MPI to sysbuild Kconfig

Browse source 
Use sysbuild to build and configure SUIT Manifest Provisioning
Information.

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
This commit is contained in:
Tomasz Chyrowicz 2024-11-21 13:55:23 +01:00 • committed by Fabio Baltieri
commit 866e690dda
1 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -342,26 +342,28 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
mpi_hex_dir = Path(os.path.join(self.cfg.build_dir, 'zephyr')) mpi_hex_dir = Path(os.path.join(self.cfg.build_dir, 'zephyr'))
# Handle Manifest Provisioning Information # Handle Manifest Provisioning Information
if self.build_conf.getboolean('CONFIG_SUIT_MPI_GENERATE'): if self.sysbuild_conf.getboolean('SB_CONFIG_SUIT_MPI_GENERATE'):
app_mpi_hex_file = os.fspath( app_mpi_hex_file = os.fspath(
mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_APP_AREA_PATH')) mpi_hex_dir / self.sysbuild_conf.get('SB_CONFIG_SUIT_MPI_APP_AREA_PATH'))
rad_mpi_hex_file = os.fspath( rad_mpi_hex_file = os.fspath(
mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_RAD_AREA_PATH') mpi_hex_dir / self.sysbuild_conf.get('SB_CONFIG_SUIT_MPI_RAD_AREA_PATH')
)
self.op_program(
app_mpi_hex_file,
'ERASE_NONE',
None,
defer=True,
core='NRFDL_DEVICE_CORE_APPLICATION',
)
self.op_program(
rad_mpi_hex_file,
'ERASE_NONE',
None,
defer=True,
core='NRFDL_DEVICE_CORE_NETWORK',
) )
if os.path.exists(app_mpi_hex_file):
self.op_program(
app_mpi_hex_file,
'ERASE_NONE',
None,
defer=True,
core='NRFDL_DEVICE_CORE_APPLICATION',
)
if os.path.exists(rad_mpi_hex_file):
self.op_program(
rad_mpi_hex_file,
'ERASE_NONE',
None,
defer=True,
core='NRFDL_DEVICE_CORE_NETWORK',
)
# Handle SUIT root manifest if application manifests are not used. # Handle SUIT root manifest if application manifests are not used.
# If an application firmware is built, the root envelope is merged # If an application firmware is built, the root envelope is merged
@ -370,13 +372,14 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
app_root_envelope_hex_file = os.fspath( app_root_envelope_hex_file = os.fspath(
mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex' mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex'
) )
self.op_program( if os.path.exists(app_root_envelope_hex_file):
app_root_envelope_hex_file, self.op_program(
'ERASE_NONE', app_root_envelope_hex_file,
None, 'ERASE_NONE',
defer=True, None,
core='NRFDL_DEVICE_CORE_APPLICATION', defer=True,
) core='NRFDL_DEVICE_CORE_APPLICATION',
)
if not self.erase and generated_uicr: if not self.erase and generated_uicr:
self.exec_op('erase', core=core, option={'chip_erase_mode': 'ERASE_UICR', self.exec_op('erase', core=core, option={'chip_erase_mode': 'ERASE_UICR',