Skip to content

sysbuild: Remove IRON variant #23088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2025
Merged

sysbuild: Remove IRON variant #23088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/sysbuild/sign_nrf54h20.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions sysbuild/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion sysbuild/Kconfig.mcuboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions sysbuild/Kconfig.netcore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sysbuild/netcore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down