From 484b95ee3ff78359373999034fd8b7024819949b Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Wed, 2 Jul 2025 12:41:25 +0200 Subject: [PATCH] sysbuild: Remove IRON variant After https://github.com/nrfconnect/sdk-nrf/pull/22433 the IRONside board variant is no longer available. Signed-off-by: Tomasz Chyrowicz --- cmake/sysbuild/sign_nrf54h20.cmake | 2 +- sysbuild/CMakeLists.txt | 4 ++-- sysbuild/Kconfig.mcuboot | 2 +- sysbuild/Kconfig.netcore | 3 +-- sysbuild/netcore.cmake | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cmake/sysbuild/sign_nrf54h20.cmake b/cmake/sysbuild/sign_nrf54h20.cmake index 5fddc1abbf8c..31ced8803644 100644 --- a/cmake/sysbuild/sign_nrf54h20.cmake +++ b/cmake/sysbuild/sign_nrf54h20.cmake @@ -209,7 +209,7 @@ function(mcuboot_sign_merged_nrf54h20 merged_hex main_image) ${imgtool_sign} ${imgtool_args} ${merged_hex} ${output}.signed.hex) endif() - if(CONFIG_MCUBOOT_GENERATE_CONFIRMED_IMAGE) + if(CONFIG_MCUBOOT_GENERATE_CONFIRMED_IMAGE OR SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT) list(APPEND byproducts ${output}.signed.confirmed.hex) set(final_artifact_hex ${output}.signed.confirmed.hex) set(BYPRODUCT_KERNEL_SIGNED_CONFIRMED_HEX_NAME "${output}.signed.confirmed.hex" diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 37291ad542da..93cbf55a24fa 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -707,7 +707,7 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) set_config_bool(${DEFAULT_IMAGE} CONFIG_CRACEN_LOAD_MICROCODE n) endif() - if(SB_CONFIG_MCUBOOT_SIGN_MERGED_BINARY AND SB_CONFIG_SOC_NRF54H20_IRON) + if(SB_CONFIG_MCUBOOT_SIGN_MERGED_BINARY AND SB_CONFIG_SOC_NRF54H20) UpdateableImage_Get(images ALL) foreach(image ${images}) set(${image}_SIGNING_SCRIPT "${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/image_signing_nrf54h20.cmake" CACHE INTERNAL "MCUboot signing script" FORCE) @@ -781,7 +781,7 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/bootconf.cmake) endif() - if(SB_CONFIG_MCUBOOT_SIGN_MERGED_BINARY AND SB_CONFIG_SOC_NRF54H20_IRON) + if(SB_CONFIG_MCUBOOT_SIGN_MERGED_BINARY AND SB_CONFIG_SOC_NRF54H20) include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/mcuboot_nrf54h20.cmake) endif() diff --git a/sysbuild/Kconfig.mcuboot b/sysbuild/Kconfig.mcuboot index d70dcd696468..259de46be63d 100644 --- a/sysbuild/Kconfig.mcuboot +++ b/sysbuild/Kconfig.mcuboot @@ -8,7 +8,7 @@ menu "MCUboot configuration" config MCUBOOT_SIGN_MERGED_BINARY bool "Sign single, merged update package [EXPERIMENTAL]" default y if (MCUBOOT_MODE_DIRECT_XIP || MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT) - depends on SOC_NRF54H20_IRON + depends on SOC_NRF54H20 select EXPERIMENTAL config MCUBOOT_BUILD_DIRECT_XIP_VARIANT diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index e3ea627cc90b..baf59c038af6 100644 --- a/sysbuild/Kconfig.netcore +++ b/sysbuild/Kconfig.netcore @@ -18,8 +18,7 @@ config SUPPORT_NETCORE config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string default "cpunet" if SOC_NRF5340_CPUAPP - default "cpurad" if SOC_NRF54H20_CPUAPP && !SOC_NRF54H20_IRON - default "cpurad/iron" if SOC_NRF54H20_IRON + default "cpurad" if SOC_NRF54H20_CPUAPP config NETCORE_REMOTE_DOMAIN string diff --git a/sysbuild/netcore.cmake b/sysbuild/netcore.cmake index 31d0a33d25ea..58447baa6614 100644 --- a/sysbuild/netcore.cmake +++ b/sysbuild/netcore.cmake @@ -21,7 +21,7 @@ if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND DEFINED SB_CONFI BOARD ${board_target_netcore} BOARD_REVISION ${BOARD_REVISION} ) - if(SB_CONFIG_BOOTLOADER_MCUBOOT AND SB_CONFIG_SOC_NRF54H20_IRON) + if(SB_CONFIG_BOOTLOADER_MCUBOOT AND SB_CONFIG_SOC_NRF54H20) set_target_properties(${SB_CONFIG_NETCORE_IMAGE_NAME} PROPERTIES IMAGE_CONF_SCRIPT ${ZEPHYR_BASE}/share/sysbuild/image_configurations/MAIN_image_default.cmake )