suit: Remove the possibility to merge MPIs

Remove the possibility to merge MPIs with the final HEX. Use the dedicated logic inside the nrf_common.py to flash those regions independently. Ref: NCSDK-27790 Signed-off-by: Tomasz Chyrowicz <[email protected]>
nrfconnect · Jun 5, 2024 · a13e6f3 · a13e6f3
1 parent 85b6366
commit a13e6f3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/cmake/sysbuild/suit.cmake b/cmake/sysbuild/suit.cmake
@@ -308,15 +308,11 @@ function(suit_setup_merge)
 
     sysbuild_get(CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT IMAGE ${image} VAR CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT KCONFIG)
     sysbuild_get(CONFIG_NRF_REGTOOL_GENERATE_UICR IMAGE ${image} VAR CONFIG_NRF_REGTOOL_GENERATE_UICR KCONFIG)
-    sysbuild_get(CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE IMAGE ${image} VAR CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE KCONFIG)
 
     set(OUTPUT_HEX_FILE "${IMAGE_BINARY_DIR}/zephyr/${CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT}")
 
     list(APPEND ARTIFACTS_TO_MERGE ${BINARY_DIR}/zephyr/suit_installed_envelopes_${IMAGE_TARGET_NAME}_merged.hex)
     list(APPEND ARTIFACTS_TO_MERGE ${IMAGE_BINARY_DIR}/zephyr/${IMAGE_BINARY_FILE}.hex)
-    if(CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE)
-      list(APPEND ARTIFACTS_TO_MERGE ${BINARY_DIR}/zephyr/suit_mpi_${IMAGE_TARGET_NAME}_merged.hex)
-    endif()
     if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
       list(APPEND ARTIFACTS_TO_MERGE ${IMAGE_BINARY_DIR}/zephyr/uicr.hex)
     endif()

diff --git a/samples/suit/recovery/prj.conf b/samples/suit/recovery/prj.conf
@@ -10,7 +10,6 @@
 # the recovery application. This is because the digests of the main application MPI
 # and the recovery application MPI is calculated together for a given domain.
 CONFIG_SUIT_MPI_GENERATE=n
-CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=n
 
 # In case of the recovery application, the "application" envelope, containing the application
 # firmware image, is actually the root envelope from the build system's point of view.

diff --git a/samples/suit/recovery/sysbuild/hci_ipc.conf b/samples/suit/recovery/sysbuild/hci_ipc.conf
@@ -7,7 +7,6 @@
 # Kconfigs necessary to build the application as a recovery application
 
 CONFIG_SUIT_ENVELOPE_TEMPLATE="../rad_recovery_envelope.yaml.jinja2"
-CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=n
 
 ###########
 CONFIG_BT_BUF_ACL_RX_SIZE=502

diff --git a/west.yml b/west.yml
@@ -63,7 +63,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: c0e08266a73496e70a6b44331b79e03bc55507b6
+      revision: pull/1775/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -239,7 +239,7 @@ manifest:
           upstream-sha: c6eaeda5a1c1c5dbb24dce7e027340cb8893a77b
           compare-by-default: false
     - name: suit-generator
-      revision: 15711cccd7700652ca3906b86d4d58cfe340e70c
+      revision: pull/122/head
       path: modules/lib/suit-generator
     - name: suit-processor
       revision: dcb84006795fe99b497e044f3435988d206ac177