Skip to content

Commit 1bb3b65

Browse files
committed
[nrf fromlist] scripts: nrf_common: Move MPI to sysbuild Kconfig
Use sysbuild to build and configure SUIT Manifest Provisioning Information. Ref: NCSDK-30461 Upstream PR #: 81723 Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent f4cb303 commit 1bb3b65

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scripts/west_commands/runners/nrf_common.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,14 +283,14 @@ def program_hex(self):
283283
# This logic should be executed only once per build.
284284
# Use sysbuild board qualifiers to select the context, with which the artifacts will be programmed.
285285
if self.build_conf.get('CONFIG_BOARD_QUALIFIERS') == self.sysbuild_conf.get('SB_CONFIG_BOARD_QUALIFIERS'):
286-
mpi_hex_dir = Path(os.path.join(self.cfg.build_dir, 'zephyr'))
286+
mpi_hex_dir = Path(os.path.join(os.path.dirname(self.cfg.build_dir), 'zephyr'))
287287

288288
# Handle Manifest Provisioning Information
289-
if self.build_conf.getboolean('CONFIG_SUIT_MPI_GENERATE'):
289+
if self.sysbuild_conf.getboolean('SB_CONFIG_SUIT_MPI_GENERATE'):
290290
app_mpi_hex_file = os.fspath(
291-
mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_APP_AREA_PATH'))
291+
mpi_hex_dir / self.sysbuild_conf.get('SB_CONFIG_SUIT_MPI_APP_AREA_PATH'))
292292
rad_mpi_hex_file = os.fspath(
293-
mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_RAD_AREA_PATH'))
293+
mpi_hex_dir / self.sysbuild_conf.get('SB_CONFIG_SUIT_MPI_RAD_AREA_PATH'))
294294
self.op_program(app_mpi_hex_file, 'ERASE_NONE', None, defer=True, core='NRFDL_DEVICE_CORE_APPLICATION')
295295
self.op_program(rad_mpi_hex_file, 'ERASE_NONE', None, defer=True, core='NRFDL_DEVICE_CORE_NETWORK')
296296

0 commit comments

Comments
 (0)