Skip to content

Commit 29f8bb2

Browse files
committed
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 89bad3f commit 29f8bb2

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

scripts/ci/check_compliance.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,9 +1049,6 @@ def check_no_undef_outside_kconfig(self, kconf):
10491049
"ZEPHYR_TRY_MASS_ERASE", # MCUBoot setting described in sysbuild
10501050
# documentation
10511051
"ZTEST_FAIL_TEST_", # regex in tests/ztest/fail/CMakeLists.txt
1052-
"SUIT_MPI_GENERATE", # Used by nRF runners to program provisioning data, based on build configuration
1053-
"SUIT_MPI_APP_AREA_PATH", # Used by nRF runners to program provisioning data, based on build configuration
1054-
"SUIT_MPI_RAD_AREA_PATH", # Used by nRF runners to program provisioning data, based on build configuration
10551052
}
10561053

10571054

scripts/west_commands/runners/nrf_common.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ def program_hex(self):
286286
mpi_hex_dir = Path(os.path.join(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)