diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index bae87cb06a0e..6254121c2a2b 100644 --- a/sysbuild/Kconfig.netcore +++ b/sysbuild/Kconfig.netcore @@ -13,11 +13,11 @@ config EXTERNAL_CONFIGURED_NETCORE config SUPPORT_NETCORE bool - default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP) + default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || BOARD_NRF5340BSIM_NRF5340_CPUAPP) config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string - default "cpunet" if SOC_NRF5340_CPUAPP + default "cpunet" if (SOC_NRF5340_CPUAPP || BOARD_NRF5340BSIM_NRF5340_CPUAPP) default "cpurad" if SOC_NRF54H20_CPUAPP config NETCORE_REMOTE_DOMAIN diff --git a/sysbuild/netcore.cmake b/sysbuild/netcore.cmake index 58447baa6614..c30dcd26757f 100644 --- a/sysbuild/netcore.cmake +++ b/sysbuild/netcore.cmake @@ -74,4 +74,10 @@ if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND DEFINED SB_CONFI endif() set_property(GLOBAL PROPERTY PM_DOMAINS ${PM_DOMAINS}) + + if(SB_CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP) + native_simulator_set_child_images(${DEFAULT_IMAGE} ${SB_CONFIG_NETCORE_IMAGE_NAME}) + native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${SB_CONFIG_NETCORE_IMAGE_NAME}) + native_simulator_set_final_executable(${DEFAULT_IMAGE}) + endif() endif() diff --git a/tests/bluetooth/bsim/nrf_auraconfig/Kconfig.sysbuild b/tests/bluetooth/bsim/nrf_auraconfig/Kconfig.sysbuild index 93ab4f730432..8aade27ef08f 100644 --- a/tests/bluetooth/bsim/nrf_auraconfig/Kconfig.sysbuild +++ b/tests/bluetooth/bsim/nrf_auraconfig/Kconfig.sysbuild @@ -6,10 +6,9 @@ source "share/sysbuild/Kconfig" -config NET_CORE_BOARD - string - default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP" - +config NRF_DEFAULT_IPC_RADIO + bool + default y config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX int diff --git a/tests/bluetooth/bsim/nrf_auraconfig/sysbuild.cmake b/tests/bluetooth/bsim/nrf_auraconfig/sysbuild.cmake deleted file mode 100644 index 231f18719643..000000000000 --- a/tests/bluetooth/bsim/nrf_auraconfig/sysbuild.cmake +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL "")) - set(NET_APP ipc_radio) - set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/../nrf/applications/${NET_APP}) - - ExternalZephyrProject_Add( - APPLICATION ${NET_APP} - SOURCE_DIR ${NET_APP_SRC_DIR} - BOARD ${SB_CONFIG_NET_CORE_BOARD} - ) - - set(${NET_APP}_CONF_FILE - ${NET_APP_SRC_DIR}/overlay-bt_hci_ipc.conf - prj.conf - CACHE INTERNAL "") - - native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP}) - - native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP}) -endif() - -native_simulator_set_final_executable(${DEFAULT_IMAGE}) diff --git a/tests/bluetooth/bsim/nrf_auraconfig/tester/Kconfig.sysbuild b/tests/bluetooth/bsim/nrf_auraconfig/tester/Kconfig.sysbuild index 93ab4f730432..8aade27ef08f 100644 --- a/tests/bluetooth/bsim/nrf_auraconfig/tester/Kconfig.sysbuild +++ b/tests/bluetooth/bsim/nrf_auraconfig/tester/Kconfig.sysbuild @@ -6,10 +6,9 @@ source "share/sysbuild/Kconfig" -config NET_CORE_BOARD - string - default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP" - +config NRF_DEFAULT_IPC_RADIO + bool + default y config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX int diff --git a/tests/bluetooth/bsim/nrf_auraconfig/tester/sysbuild.cmake b/tests/bluetooth/bsim/nrf_auraconfig/tester/sysbuild.cmake deleted file mode 100644 index 231f18719643..000000000000 --- a/tests/bluetooth/bsim/nrf_auraconfig/tester/sysbuild.cmake +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL "")) - set(NET_APP ipc_radio) - set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/../nrf/applications/${NET_APP}) - - ExternalZephyrProject_Add( - APPLICATION ${NET_APP} - SOURCE_DIR ${NET_APP_SRC_DIR} - BOARD ${SB_CONFIG_NET_CORE_BOARD} - ) - - set(${NET_APP}_CONF_FILE - ${NET_APP_SRC_DIR}/overlay-bt_hci_ipc.conf - prj.conf - CACHE INTERNAL "") - - native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP}) - - native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP}) -endif() - -native_simulator_set_final_executable(${DEFAULT_IMAGE})