diff --git a/modules/mcuboot/boot/zephyr/Kconfig b/modules/mcuboot/boot/zephyr/Kconfig index da8d83d1a067..ad2946b59072 100644 --- a/modules/mcuboot/boot/zephyr/Kconfig +++ b/modules/mcuboot/boot/zephyr/Kconfig @@ -106,7 +106,7 @@ config BOOT_ERASE_PROGRESSIVELY config BOOT_IMAGE_ACCESS_HOOKS bool - default y if MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1 + default y if MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1 && SOC_NRF5340_CPUAPP depends on MCUBOOT config BOOT_IMAGE_ACCESS_HOOK_NRF5340 diff --git a/sysbuild/Kconfig.mcuboot b/sysbuild/Kconfig.mcuboot index 58342423dff1..7908e0d0a77a 100644 --- a/sysbuild/Kconfig.mcuboot +++ b/sysbuild/Kconfig.mcuboot @@ -68,6 +68,7 @@ config MCUBOOT_APPLICATION_IMAGE_NUMBER config MCUBOOT_NETWORK_CORE_IMAGE_NUMBER int default 1 if NETCORE_APP_UPDATE && !MCUBOOT_MODE_SINGLE_APP + default 1 if BOOTLOADER_MCUBOOT && !NETCORE_NONE && SOC_NRF54H20 default -1 config MCUBOOT_WIFI_PATCHES_IMAGE_NUMBER diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index baf59c038af6..e3ea627cc90b 100644 --- a/sysbuild/Kconfig.netcore +++ b/sysbuild/Kconfig.netcore @@ -18,7 +18,8 @@ config SUPPORT_NETCORE config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string default "cpunet" if SOC_NRF5340_CPUAPP - default "cpurad" if SOC_NRF54H20_CPUAPP + default "cpurad" if SOC_NRF54H20_CPUAPP && !SOC_NRF54H20_IRON + default "cpurad/iron" if SOC_NRF54H20_IRON config NETCORE_REMOTE_DOMAIN string diff --git a/sysbuild/netcore.cmake b/sysbuild/netcore.cmake index 69681bc86948..c56b754badac 100644 --- a/sysbuild/netcore.cmake +++ b/sysbuild/netcore.cmake @@ -21,6 +21,11 @@ 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) + set_target_properties(${SB_CONFIG_NETCORE_IMAGE_NAME} PROPERTIES + IMAGE_CONF_SCRIPT ${ZEPHYR_BASE}/share/sysbuild/image_configurations/MAIN_image_default.cmake + ) + endif() if(NOT "${SB_CONFIG_NETCORE_IMAGE_DOMAIN}" IN_LIST PM_DOMAINS) list(APPEND PM_DOMAINS ${SB_CONFIG_NETCORE_IMAGE_DOMAIN})