scripts: nrf_common: Move MPI to sysbuild Kconfig
Use sysbuild to build and configure SUIT Manifest Provisioning Information. Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
This commit is contained in:
parent
811ff1f209
commit
866e690dda
1 changed files with 27 additions and 24 deletions
|
@ -342,26 +342,28 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
|
|||
mpi_hex_dir = Path(os.path.join(self.cfg.build_dir, 'zephyr'))
|
||||
|
||||
# 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(
|
||||
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(
|
||||
mpi_hex_dir / self.build_conf.get('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',
|
||||
mpi_hex_dir / self.sysbuild_conf.get('SB_CONFIG_SUIT_MPI_RAD_AREA_PATH')
|
||||
)
|
||||
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.
|
||||
# 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(
|
||||
mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex'
|
||||
)
|
||||
self.op_program(
|
||||
app_root_envelope_hex_file,
|
||||
'ERASE_NONE',
|
||||
None,
|
||||
defer=True,
|
||||
core='NRFDL_DEVICE_CORE_APPLICATION',
|
||||
)
|
||||
if os.path.exists(app_root_envelope_hex_file):
|
||||
self.op_program(
|
||||
app_root_envelope_hex_file,
|
||||
'ERASE_NONE',
|
||||
None,
|
||||
defer=True,
|
||||
core='NRFDL_DEVICE_CORE_APPLICATION',
|
||||
)
|
||||
|
||||
if not self.erase and generated_uicr:
|
||||
self.exec_op('erase', core=core, option={'chip_erase_mode': 'ERASE_UICR',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue