samples: suit: Refactor of external flash configurations

samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include "nrf54h20dk_nrf54h20_cpuapp_common.dtsi"
-
 / {
 	chosen {
 		extmem-device = &mx25uw63;

samples/suit/smp_transfer/sample.yaml

@@ -3,7 +3,6 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
-# dummy change for triggers
 
 sample:
   name: SUIT update through SMP sample
@@ -21,23 +20,28 @@ tests:
       - FILE_SUFFIX=bt
     tags: suit bluetooth ci_samples_suit
 
-  sample.suit.smp_transfer.full:
+  sample.suit.smp_transfer.full_processing:
     extra_configs:
       - CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_FULL=y
     tags: suit ci_samples_suit
 
-  sample.suit.smp_transfer.full.bt:
+  sample.suit.smp_transfer.full_processing.bt:
     extra_args:
       - FILE_SUFFIX=bt
     extra_configs:
       - CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_FULL=y
     tags: suit bluetooth ci_samples_suit
 
-  sample.suit.smp_transfer.full.extflash:
+  sample.suit.smp_transfer.full_processing.extflash:
     extra_args:
-      - FILE_SUFFIX=extflash
-      - OVERLAY_CONFIG="sysbuild/smp_transfer.conf"
+      - EXTRA_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay"
+      - SB_CONFIG_SUIT_BUILD_FLASH_COMPANION=y
+      # Workaround for sample.yaml - problems with strings. In the command line simply use:
+      # -D'SB_CONFIG_SUIT_ENVELOPE_ROOT_TEMPLATE_FILENAME="root_with_binary_nordic_top_extflash.yaml.jinja2"'
+      - SB_EXTRA_CONF_FILE="sysbuild_extflash_template.conf"
     extra_configs:
+      - CONFIG_SUIT_ENVELOPE_TEMPLATE_FILENAME="app_envelope_extflash.yaml.jinja2"
+      - CONFIG_SUIT_STREAM_SOURCE_FLASH=y
       - CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_FULL=y
     tags: suit ci_samples_suit
 
@@ -49,33 +53,52 @@ tests:
       - CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_FULL=y
     tags: suit bluetooth ci_samples_suit
 
-  sample.suit.smp_transfer.full.extflash.bt:
+  sample.suit.smp_transfer.full_processing.extflash.bt:
     extra_args:
-      - FILE_SUFFIX=extflash
-      - OVERLAY_CONFIG="sysbuild/smp_transfer_bt.conf"
-      - SB_OVERLAY_CONFIG="sysbuild_bt.conf"
+      - FILE_SUFFIX=bt
+      - EXTRA_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay"
+      - SB_CONFIG_SUIT_BUILD_FLASH_COMPANION=y
+      # Workaround for sample.yaml - problems with strings. In the command line simply use:
+      # -D'SB_CONFIG_SUIT_ENVELOPE_ROOT_TEMPLATE_FILENAME="root_with_binary_nordic_top_extflash.yaml.jinja2"'
+      - SB_EXTRA_CONF_FILE="sysbuild_extflash_template.conf"
+      # Workaround for sample.yaml (part also in sysbuild.cmake), in the command line simply use:
+      # -D'hci_ipc_CONFIG_SUIT_ENVELOPE_TEMPLATE_FILENAME="rad_envelope_extflash.yaml.jinja2"'
+      - hci_ipc_TARGET_EXTRA_CONF_FILE="sysbuild/hci_ipc_extflash_template.conf"
     extra_configs:
+      - CONFIG_SUIT_ENVELOPE_TEMPLATE_FILENAME="app_envelope_extflash.yaml.jinja2"
+      - CONFIG_SUIT_STREAM_SOURCE_FLASH=y
       - CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_FULL=y
     tags: suit bluetooth ci_samples_suit
 
-  sample.suit.smp_transfer.full.extflash.extracted_cache:
+  sample.suit.smp_transfer.cache_push.extflash:
     extra_args:
-      - FILE_SUFFIX=extflash
+      - EXTRA_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay"
       - SUIT_DFU_CACHE_PARTITION_1_EB_SIZE=4096
-      - OVERLAY_CONFIG="sysbuild/smp_transfer.conf"
+      - SB_CONFIG_SUIT_BUILD_FLASH_COMPANION=y
+      # Workaround for sample.yaml - problems with strings. In the command line simply use:
+      # -D'SB_CONFIG_SUIT_ENVELOPE_ROOT_TEMPLATE_FILENAME="root_with_binary_nordic_top_extflash.yaml.jinja2"'
+      - SB_EXTRA_CONF_FILE="sysbuild_extflash_template.conf"
     extra_configs:
+      - CONFIG_SUIT_ENVELOPE_TEMPLATE_FILENAME="app_envelope_extflash.yaml.jinja2"
       - CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE=y
       - CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_PUSH_TO_CACHE=y
     tags: suit ci_samples_suit
 
-  sample.suit.smp_transfer.full.extflash.bt.extracted_cache:
+  sample.suit.smp_transfer.cache_push.extflash.bt:
     extra_args:
-      - FILE_SUFFIX=extflash
-      - OVERLAY_CONFIG="sysbuild/smp_transfer_bt.conf"
-      - SB_OVERLAY_CONFIG="sysbuild_bt.conf"
+      - FILE_SUFFIX=bt
+      - EXTRA_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay"
       - SUIT_DFU_CACHE_PARTITION_1_EB_SIZE=4096
+      - SB_CONFIG_SUIT_BUILD_FLASH_COMPANION=y
+      # Workaround for sample.yaml - problems with strings. In the command line simply use:
+      # -D'SB_CONFIG_SUIT_ENVELOPE_ROOT_TEMPLATE_FILENAME="root_with_binary_nordic_top_extflash.yaml.jinja2"'
+      - SB_EXTRA_CONF_FILE="sysbuild_extflash_template.conf"
+      # Workaround for sample.yaml (part also in sysbuild.cmake), in the command line simply use:
+      # -D'hci_ipc_CONFIG_SUIT_ENVELOPE_TEMPLATE_FILENAME="rad_envelope_extflash.yaml.jinja2"'
+      - hci_ipc_TARGET_EXTRA_CONF_FILE="sysbuild/hci_ipc_extflash_template.conf"
       - hci_ipc_CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE=y
     extra_configs:
+      - CONFIG_SUIT_ENVELOPE_TEMPLATE_FILENAME="app_envelope_extflash.yaml.jinja2"
       - CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE=y
       - CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_PUSH_TO_CACHE=y
 

samples/suit/smp_transfer/sysbuild.cmake

@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# TODO: This is a temporary solution to be able to pass additional configuration files
+# through sample.yaml. This will be deleted when the possibility to pass string
+# Kconfig options for radio core (such as hci_ipc_...) through sample.yaml
+
+if(DEFINED hci_ipc_TARGET_EXTRA_CONF_FILE)
+  list(APPEND hci_ipc_EXTRA_CONF_FILE "${CMAKE_CURRENT_LIST_DIR}/${hci_ipc_TARGET_EXTRA_CONF_FILE}")
+  list(REMOVE_DUPLICATES hci_ipc_EXTRA_CONF_FILE)
+  set(hci_ipc_EXTRA_CONF_FILE "${hci_ipc_EXTRA_CONF_FILE}" CACHE INTERNAL "")
+endif()

samples/suit/smp_transfer/sysbuild/smp_transfer_extflash.conf → samples/suit/smp_transfer/sysbuild/hci_ipc_extflash_template.conf

@@ -4,5 +4,4 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_SUIT_STREAM_SOURCE_FLASH=y
-CONFIG_SUIT_ENVELOPE_TEMPLATE_FILENAME="app_envelope_extflash.yaml.jinja2"
+CONFIG_SUIT_ENVELOPE_TEMPLATE_FILENAME="rad_envelope_extflash.yaml.jinja2"

samples/suit/smp_transfer/sysbuild_extflash.conf → samples/suit/smp_transfer/sysbuild_extflash_template.conf

@@ -4,6 +4,4 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-SB_CONFIG_SUIT_ENVELOPE=y
-SB_CONFIG_SUIT_BUILD_FLASH_COMPANION=y
 SB_CONFIG_SUIT_ENVELOPE_ROOT_TEMPLATE_FILENAME="root_with_binary_nordic_top_extflash.yaml.jinja2"