From 7a9dc9cd2b4f5d1da1559ded738fdc0f44ab7256 Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Wed, 19 Mar 2025 14:19:31 +0000 Subject: [PATCH 1/2] manifest: Update sdk-zephyr revision (auto-manifest PR) Automatically created by Github Action Signed-off-by: Nordic Builder --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index d8e9b7b66a87..098dd6c44f73 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 95fb969a73a24d4708e8a1dd8eae0bbb6ede5db2 + revision: pull/2643/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 3990b8fb5a8576c6f0877b949ecb4325e9ad486c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Wed, 19 Mar 2025 15:19:40 +0100 Subject: [PATCH 2/2] cmake: config: disable SUIT for iron board variant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is compatible with the Nordic IRONside SE for nRF54H20. Ref: NCSDK-NONE Signed-off-by: Håkon Amundsen --- subsys/suit/Kconfig | 1 + sysbuild/CMakeLists.txt | 6 ++++-- sysbuild/Kconfig.suit_provisioning | 1 + west.yml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/subsys/suit/Kconfig b/subsys/suit/Kconfig index 437eb3075472..2ab614d876c8 100644 --- a/subsys/suit/Kconfig +++ b/subsys/suit/Kconfig @@ -6,6 +6,7 @@ menuconfig SUIT bool "Enable SUIT modules" + depends on !SOC_NRF54H20_IRON if SUIT diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index ebb62243ab75..fc4add8f32d8 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -719,8 +719,10 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) endif() include_packaging() - include_suit_provisioning() - include_suit() + if(NOT SB_CONFIG_SOC_NRF54H20_IRON) + include_suit_provisioning() + include_suit() + endif() if(SB_CONFIG_SECURE_BOOT OR SB_CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION) include_provision_hex() diff --git a/sysbuild/Kconfig.suit_provisioning b/sysbuild/Kconfig.suit_provisioning index 2f02969bce0d..bc351201863e 100644 --- a/sysbuild/Kconfig.suit_provisioning +++ b/sysbuild/Kconfig.suit_provisioning @@ -9,6 +9,7 @@ menu "SUIT provisioning" config SUIT_MPI_GENERATE bool "Generate SUIT Manifest Provisioning Information binary" default y if SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X + depends on !SOC_NRF54H20_IRON if SUIT_MPI_GENERATE diff --git a/west.yml b/west.yml index 098dd6c44f73..0048180810c8 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: pull/2643/head + revision: 99bbeff21583f245dab9e56afe73c488d93e271f import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above