File tree Expand file tree Collapse file tree 4 files changed +9
-2
lines changed
modules/mcuboot/boot/zephyr Expand file tree Collapse file tree 4 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ config BOOT_ERASE_PROGRESSIVELY
106106
107107config BOOT_IMAGE_ACCESS_HOOKS
108108 bool
109- default y if MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1
109+ default y if MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1 && SOC_NRF5340_CPUAPP
110110 depends on MCUBOOT
111111
112112config BOOT_IMAGE_ACCESS_HOOK_NRF5340
Original file line number Diff line number Diff line change @@ -68,6 +68,7 @@ config MCUBOOT_APPLICATION_IMAGE_NUMBER
6868config MCUBOOT_NETWORK_CORE_IMAGE_NUMBER
6969 int
7070 default 1 if NETCORE_APP_UPDATE && !MCUBOOT_MODE_SINGLE_APP
71+ default 1 if BOOTLOADER_MCUBOOT && !NETCORE_NONE && SOC_NRF54H20
7172 default -1
7273
7374config MCUBOOT_WIFI_PATCHES_IMAGE_NUMBER
Original file line number Diff line number Diff line change @@ -18,7 +18,8 @@ config SUPPORT_NETCORE
1818config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER
1919 string
2020 default "cpunet" if SOC_NRF5340_CPUAPP
21- default "cpurad" if SOC_NRF54H20_CPUAPP
21+ default "cpurad" if SOC_NRF54H20_CPUAPP && !SOC_NRF54H20_IRON
22+ default "cpurad/iron" if SOC_NRF54H20_IRON
2223
2324config NETCORE_REMOTE_DOMAIN
2425 string
Original file line number Diff line number Diff line change @@ -21,6 +21,11 @@ if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND DEFINED SB_CONFI
2121 BOARD ${board_target_netcore}
2222 BOARD_REVISION ${BOARD_REVISION}
2323 )
24+ if (SB_CONFIG_BOOTLOADER_MCUBOOT AND SB_CONFIG_SOC_NRF54H20_IRON)
25+ set_target_properties (${SB_CONFIG_NETCORE_IMAGE_NAME} PROPERTIES
26+ IMAGE_CONF_SCRIPT ${ZEPHYR_BASE} /share/sysbuild/image_configurations/MAIN_image_default.cmake
27+ )
28+ endif ()
2429
2530 if (NOT "${SB_CONFIG_NETCORE_IMAGE_DOMAIN} " IN_LIST PM_DOMAINS)
2631 list (APPEND PM_DOMAINS ${SB_CONFIG_NETCORE_IMAGE_DOMAIN} )
You can’t perform that action at this time.
0 commit comments