Skip to content

Commit

Permalink
[nrf fromlist] scripts: nrf_common: Move MPI to sysbuild Kconfig
Browse files Browse the repository at this point in the history
Use sysbuild to build and configure SUIT Manifest Provisioning
Information.

Ref: NCSDK-30461

Upstream PR #: 81723

Signed-off-by: Tomasz Chyrowicz <[email protected]>
  • Loading branch information
tomchy committed Nov 25, 2024
1 parent f4cb303 commit 1bb3b65
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scripts/west_commands/runners/nrf_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,14 +283,14 @@ def program_hex(self):
# This logic should be executed only once per build.
# Use sysbuild board qualifiers to select the context, with which the artifacts will be programmed.
if self.build_conf.get('CONFIG_BOARD_QUALIFIERS') == self.sysbuild_conf.get('SB_CONFIG_BOARD_QUALIFIERS'):
mpi_hex_dir = Path(os.path.join(self.cfg.build_dir, 'zephyr'))
mpi_hex_dir = Path(os.path.join(os.path.dirname(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'))
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')

Expand Down

0 comments on commit 1bb3b65

Please sign in to comment.