[nrf noup] tests: bluetooth: tester: build with sysbuild

make hci_ipc config file generic.
Sysbuild configuration to be adaptable (nRF53/54H)

Signed-off-by: Aytürk Düzen <[email protected]>

Author: AyturkDuzen

samples/bluetooth/hci_ipc/nrf5340_cpunet-bt_ll_softdevice.conf

@@ -0,0 +1,34 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+
+# Host
+CONFIG_BT_BROADCASTER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_PER_ADV=y
+CONFIG_BT_PER_ADV_SYNC=y
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=n
+CONFIG_BT_LL_SOFTDEVICE=y
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
+

samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf

@@ -0,0 +1,34 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+
+# Host
+CONFIG_BT_BROADCASTER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_PER_ADV=y
+CONFIG_BT_PER_ADV_SYNC=y
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=n
+CONFIG_BT_LL_SOFTDEVICE=y
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
+

samples/bluetooth/hci_ipc/prj.conf

@@ -10,7 +10,6 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=16
 
-
 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since
 # Host number of completed commands does not follow normal flow control.
 CONFIG_BT_BUF_CMD_TX_COUNT=10

tests/bluetooth/tester/Kconfig.sysbuild

@@ -5,6 +5,7 @@ source "share/sysbuild/Kconfig"
 
 config NET_CORE_BOARD
 	string
+	default "nrf54h20dk/nrf54h20/cpurad" if "$(BOARD)" = "nrf54h20dk"
 	default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
 	default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
 

tests/bluetooth/tester/nrf5340_hci_ipc.conf renamed to tests/bluetooth/tester/hci_ipc.conf

@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
-	# For builds in the nrf5340, we build the netcore image with the controller
-
 	set(NET_APP hci_ipc)
 	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
 
@@ -13,13 +11,30 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
 	)
 
-	set(${NET_APP}_CONF_FILE
-	 ${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
-	 CACHE INTERNAL ""
-	)
+	if(NOT "${SNIPPET}" STREQUAL "bt-ll-sw-split")
+		if(SB_CONFIG_SOC_NRF5340_CPUAPP)
+			set(${NET_APP}_CONF_FILE
+			${NET_APP_SRC_DIR}/nrf5340_cpunet-bt_ll_softdevice.conf
+			CACHE INTERNAL ""
+			)
+		endif()
+
+		if(SB_CONFIG_SOC_NRF54H20_CPUAPP)
+			set(${NET_APP}_CONF_FILE
+			${NET_APP_SRC_DIR}/nrf54h20_cpurad-bt_ll_softdevice.conf
+			CACHE INTERNAL ""
+			)
+		endif()
+	else()
+		message(FATAL_ERROR "HEYYOO2")
+		set(${NET_APP}_CONF_FILE
+		${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
+		CACHE INTERNAL ""
+		)
+	endif()
 
 	set(${NET_APP}_EXTRA_CONF_FILE
-	 ${APP_DIR}/nrf5340_hci_ipc_cpunet.conf
+	 ${APP_DIR}/hci_ipc_cpunet.conf
 	 CACHE INTERNAL ""
 	)