tests: nrf_auracast: Simplify network core building

Use NRF_DEFAULT_IPC_RADIO to enable building of the hci_ipc
radio sample for the network core instead of adding it manually.

Signed-off-by: Rubin Gerritsen <[email protected]>

Author: rugeGerritsen

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

tests/bluetooth/bsim/nrf_auraconfig/sysbuild.cmake

@@ -4,24 +4,9 @@
 # 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})
+if (SB_CONFIG_NET_CORE_BOARD)
+  native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${SB_CONFIG_NETCORE_IMAGE_NAME})
+  native_simulator_set_child_images(${DEFAULT_IMAGE} ${SB_CONFIG_NETCORE_IMAGE_NAME})
 endif()
 
 native_simulator_set_final_executable(${DEFAULT_IMAGE})

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

tests/bluetooth/bsim/nrf_auraconfig/tester/sysbuild.cmake

@@ -4,24 +4,9 @@
 # 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})
+if (SB_CONFIG_NET_CORE_BOARD)
+  native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${SB_CONFIG_NETCORE_IMAGE_NAME})
+  native_simulator_set_child_images(${DEFAULT_IMAGE} ${SB_CONFIG_NETCORE_IMAGE_NAME})
 endif()
 
 native_simulator_set_final_executable(${DEFAULT_IMAGE})