From 0b7bb0f4366684c2188747c4bbfaec74cd963a77 Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Thu, 21 Nov 2024 13:55:23 +0100 Subject: [PATCH] scripts: nrf_common: Move MPI to sysbuild Kconfig Use sysbuild to build and configure SUIT Manifest Provisioning Information. Signed-off-by: Tomasz Chyrowicz --- scripts/west_commands/runners/nrf_common.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py index d12385cec47969..c8ed11dade0aa5 100644 --- a/scripts/west_commands/runners/nrf_common.py +++ b/scripts/west_commands/runners/nrf_common.py @@ -339,14 +339,14 @@ def program_hex(self): 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,