Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 modules/mcuboot/boot/zephyr/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sysbuild/Kconfig.mcuboot
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion sysbuild/Kconfig.netcore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions sysbuild/netcore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down