diff --git a/samples/sysbuild/hello_world/Kconfig.sysbuild b/samples/sysbuild/hello_world/Kconfig.sysbuild index edec01b94c9..7ebe170e85f 100644 --- a/samples/sysbuild/hello_world/Kconfig.sysbuild +++ b/samples/sysbuild/hello_world/Kconfig.sysbuild @@ -3,5 +3,34 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" +choice REMOTE_NRF54H20_CORE + prompt "Remote nRF54h20 core" + default REMOTE_NRF54H20_CPUFLPR_CORE + depends on SOC_NRF54H20_CPUAPP + +config REMOTE_NRF54H20_CPUFLPR_CORE + bool "flpr core" + +config REMOTE_NRF54H20_CPUFLPR_XIP_CORE + bool "flpr/xip core" + +config REMOTE_NRF54H20_CPUPPR_CORE + bool "ppr core" + +config REMOTE_NRF54H20_CPUPPR_XIP_CORE + bool "ppr/xip core" + +config REMOTE_NRF54H20_CPURAD_CORE + bool "cpurad" + +endchoice + config REMOTE_BOARD - string "The board used for remote target" + string + default "$(BOARD)/nrf5340/cpunet" if SOC_NRF5340_CPUAPP + default "$(BOARD)/nrf54l15/cpuflpr" if SOC_NRF54L15_CPUAPP + default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP && REMOTE_NRF54H20_CPURAD_CORE + default "$(BOARD)/nrf54h20/cpuppr" if SOC_NRF54H20_CPUAPP && REMOTE_NRF54H20_CPUPPR_CORE + default "$(BOARD)/nrf54h20/cpuppr/xip" if SOC_NRF54H20_CPUAPP && REMOTE_NRF54H20_CPUPPR_XIP_CORE + default "$(BOARD)/nrf54h20/cpuflpr" if SOC_NRF54H20_CPUAPP && REMOTE_NRF54H20_CPUFLPR_CORE + default "$(BOARD)/nrf54h20/cpuflpr/xip" if SOC_NRF54H20_CPUAPP && REMOTE_NRF54H20_CPUFLPR_XIP_CORE diff --git a/samples/sysbuild/hello_world/sample.yaml b/samples/sysbuild/hello_world/sample.yaml index e638594c634..a92107777c5 100644 --- a/samples/sysbuild/hello_world/sample.yaml +++ b/samples/sysbuild/hello_world/sample.yaml @@ -18,7 +18,6 @@ tests: - nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp - extra_args: SB_CONF_FILE=sysbuild/nrf5340dk_nrf5340_cpunet.conf sample.sysbuild.hello_world.nrf54h20dk_cpuapp_cpurad: platform_allow: @@ -26,7 +25,7 @@ tests: integration_platforms: - nrf54h20dk/nrf54h20/cpuapp extra_args: - - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf + - SB_CONFIG_REMOTE_NRF54H20_CPURAD_CORE=y - hello_world_CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y sample.sysbuild.hello_world.nrf54h20dk_cpuapp_cpuppr: platform_allow: @@ -34,8 +33,7 @@ tests: integration_platforms: - nrf54h20dk/nrf54h20/cpuapp extra_args: - - - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf + - SB_CONFIG_REMOTE_NRF54H20_CPUPPR_CORE=y - hello_world_SNIPPET=nordic-ppr sample.sysbuild.hello_world.nrf54h20dk_cpuapp_cpuppr_xip: platform_allow: @@ -43,19 +41,20 @@ tests: integration_platforms: - nrf54h20dk/nrf54h20/cpuapp extra_args: - - - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf + - SB_CONFIG_REMOTE_NRF54H20_CPUPPR_XIP_CORE=y - hello_world_SNIPPET=nordic-ppr-xip - sample.sysbuild.hello_world.nrf54l15dk_nrf54l15_cpuflpr: + sample.sysbuild.hello_world.nrf54l15_cpuflpr: platform_allow: - nrf54l15dk/nrf54l15/cpuapp - ophelia4ev/nrf54l15/cpuapp + - bl54l15_dvk/nrf54l15/cpuapp + - bl54l15u_dvk/nrf54l15/cpuapp integration_platforms: - nrf54l15dk/nrf54l15/cpuapp - ophelia4ev/nrf54l15/cpuapp + - bl54l15_dvk/nrf54l15/cpuapp + - bl54l15u_dvk/nrf54l15/cpuapp extra_args: - - - SB_CONF_FILE=sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf - hello_world_SNIPPET=nordic-flpr sample.sysbuild.hello_world.nrf54h20dk_cpuapp_cpuflpr: platform_allow: @@ -63,8 +62,7 @@ tests: integration_platforms: - nrf54h20dk/nrf54h20/cpuapp extra_args: - - - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuflpr.conf + - SB_CONFIG_REMOTE_NRF54H20_CPUFLPR_CORE=y - hello_world_SNIPPET=nordic-flpr sample.sysbuild.hello_world.nrf54h20dk_cpuapp_cpuflpr_xip: platform_allow: @@ -72,21 +70,5 @@ tests: integration_platforms: - nrf54h20dk/nrf54h20/cpuapp extra_args: - - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuflpr_xip.conf + - SB_CONFIG_REMOTE_NRF54H20_CPUFLPR_XIP_CORE=y - hello_world_SNIPPET=nordic-flpr-xip - sample.sysbuild.hello_world.bl54l15_dvk_nrf54l15_cpuflpr: - platform_allow: - - bl54l15_dvk/nrf54l15/cpuapp - integration_platforms: - - bl54l15_dvk/nrf54l15/cpuapp - extra_args: - - SB_CONF_FILE=sysbuild/bl54l15_dvk_nrf54l15_cpuflpr.conf - - hello_world_SNIPPET=nordic-flpr - sample.sysbuild.hello_world.bl54l15u_dvk_nrf54l15_cpuflpr: - platform_allow: - - bl54l15u_dvk/nrf54l15/cpuapp - integration_platforms: - - bl54l15u_dvk/nrf54l15/cpuapp - extra_args: - - SB_CONF_FILE=sysbuild/bl54l15u_dvk_nrf54l15_cpuflpr.conf - - hello_world_SNIPPET=nordic-flpr diff --git a/samples/sysbuild/hello_world/sysbuild.cmake b/samples/sysbuild/hello_world/sysbuild.cmake index 8f8fc49dbff..654c4175faa 100644 --- a/samples/sysbuild/hello_world/sysbuild.cmake +++ b/samples/sysbuild/hello_world/sysbuild.cmake @@ -1,27 +1,26 @@ # Copyright (c) 2024 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") - message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name") -endif() +if(DEFINED SB_CONFIG_REMOTE_BOARD) + ExternalZephyrProject_Add( + APPLICATION remote + SOURCE_DIR ${APP_DIR}/remote + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} + ) -ExternalZephyrProject_Add( - APPLICATION remote - SOURCE_DIR ${APP_DIR}/remote - BOARD ${SB_CONFIG_REMOTE_BOARD} -) + if(SB_CONFIG_SOC_SERIES_NRF53X) + set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET) + set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote) + set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote) + set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "") + else(SB_CONFIG_SOC_SERIES_NRF54LX) + set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUFLPR) + set_property(GLOBAL APPEND PROPERTY PM_CPUFLPR_IMAGES remote) + set_property(GLOBAL PROPERTY DOMAIN_APP_CPUFLPR remote) + set(CPUFLPR_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "") + endif() -if(SB_CONFIG_SOC_SERIES_NRF53X) - set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET) - set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote) - set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote) - set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "") -else(SB_CONFIG_SOC_SERIES_NRF54LX) - set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUFLPR) - set_property(GLOBAL APPEND PROPERTY PM_CPUFLPR_IMAGES remote) - set_property(GLOBAL PROPERTY DOMAIN_APP_CPUFLPR remote) - set(CPUFLPR_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "") + add_dependencies(${DEFAULT_IMAGE} remote) + sysbuild_add_dependencies(FLASH ${DEFAULT_IMAGE} remote) endif() - -add_dependencies(${DEFAULT_IMAGE} remote) -sysbuild_add_dependencies(FLASH ${DEFAULT_IMAGE} remote) diff --git a/samples/sysbuild/hello_world/sysbuild/bl54l15_dvk_nrf54l15_cpuflpr.conf b/samples/sysbuild/hello_world/sysbuild/bl54l15_dvk_nrf54l15_cpuflpr.conf deleted file mode 100644 index e8014484067..00000000000 --- a/samples/sysbuild/hello_world/sysbuild/bl54l15_dvk_nrf54l15_cpuflpr.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2025 Nordic Semiconductor ASA -# Copyright (c) 2025 Ezurio LLC -# -# SPDX-License-Identifier: Apache-2.0 - -SB_CONFIG_REMOTE_BOARD="bl54l15_dvk/nrf54l15/cpuflpr" diff --git a/samples/sysbuild/hello_world/sysbuild/bl54l15u_dvk_nrf54l15_cpuflpr.conf b/samples/sysbuild/hello_world/sysbuild/bl54l15u_dvk_nrf54l15_cpuflpr.conf deleted file mode 100644 index 927961f56e3..00000000000 --- a/samples/sysbuild/hello_world/sysbuild/bl54l15u_dvk_nrf54l15_cpuflpr.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2025 Nordic Semiconductor ASA -# Copyright (c) 2025 Ezurio LLC -# -# SPDX-License-Identifier: Apache-2.0 - -SB_CONFIG_REMOTE_BOARD="bl54l15u_dvk/nrf54l15/cpuflpr" diff --git a/samples/sysbuild/hello_world/sysbuild/nrf5340dk_nrf5340_cpunet.conf b/samples/sysbuild/hello_world/sysbuild/nrf5340dk_nrf5340_cpunet.conf deleted file mode 100644 index b8ae05d4ef6..00000000000 --- a/samples/sysbuild/hello_world/sysbuild/nrf5340dk_nrf5340_cpunet.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_REMOTE_BOARD="nrf5340dk/nrf5340/cpunet" diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuflpr.conf b/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuflpr.conf deleted file mode 100644 index 1f67cc41798..00000000000 --- a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuflpr.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuflpr" diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuflpr_xip.conf b/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuflpr_xip.conf deleted file mode 100644 index 0d827be9a1b..00000000000 --- a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuflpr_xip.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuflpr/xip" diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf b/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf deleted file mode 100644 index f50bc8553a0..00000000000 --- a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuppr" diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf b/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf deleted file mode 100644 index 270c92c09a4..00000000000 --- a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuppr/xip" diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf deleted file mode 100644 index dd863e78d99..00000000000 --- a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf b/samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf deleted file mode 100644 index 203dc628f47..00000000000 --- a/samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_REMOTE_BOARD="nrf54l15dk/nrf54l15/cpuflpr"