From f859c1595ac409451ed616a1c5a82e88eef0441f Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Thu, 21 Nov 2024 13:55:23 +0100 Subject: [PATCH] [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 --- scripts/west_commands/runners/nrf_common.py | 51 +++++++++++---------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py index cc04ebcbb90..67634132408 100644 --- a/scripts/west_commands/runners/nrf_common.py +++ b/scripts/west_commands/runners/nrf_common.py @@ -286,26 +286,28 @@ def program_hex(self): 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 @@ -314,13 +316,14 @@ def program_hex(self): 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 cpuapp: core = 'NRFDL_DEVICE_CORE_APPLICATION'