Bluetooth: samples: hci_uart: Refactor conf files

Refactor conf files to use prj.conf + board/<board>.conf configuration.
This allows us to have put common configurations into the prj.conf and
have board specific configs in each board file.
This also respects adding additional prj.conf files such as
-DCONF_FILE='nrf5.conf debug.conf' to add debug configuration.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>

samples/bluetooth/hci_uart/CMakeLists.txt

@@ -1,15 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.13.1)
-if(BOARD STREQUAL bbc_microbit)
-  set(CONF_FILE microbit.conf)
-elseif(BOARD STREQUAL nrf52840_pca10090)
-  set(CONF_FILE nrf52840_pca10090.conf)
-elseif(BOARD STREQUAL rv32m1_vega_ri5cy)
-  set(CONF_FILE rv32m1_vega_ri5cy.conf)
-else()
-  set(CONF_FILE nrf5.conf)
-endif()
 
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(hci_uart)

samples/bluetooth/hci_uart/boards/96b_nitrogen.conf

@@ -1,14 +1,7 @@
-CONFIG_CONSOLE=n
-CONFIG_STDOUT_CONSOLE=n
-CONFIG_UART_CONSOLE=n
 CONFIG_GPIO=y
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_0_NRF_FLOW_CONTROL=y
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
-CONFIG_BT=y
-CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=16
 CONFIG_BT_TINYCRYPT_ECC=n
 CONFIG_BT_CTLR_DTM_HCI=y

samples/bluetooth/hci_uart/boards/bbc_microbit.conf

@@ -1,15 +1,8 @@
-CONFIG_CONSOLE=n
-CONFIG_STDOUT_CONSOLE=n
-CONFIG_UART_CONSOLE=n
 CONFIG_GPIO=y
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_0_NRF_FLOW_CONTROL=n
 CONFIG_MAIN_STACK_SIZE=512
 CONFIG_IDLE_STACK_SIZE=256
 CONFIG_ISR_STACK_SIZE=512
-CONFIG_BT=y
-CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=10
 CONFIG_BT_PHY_UPDATE=n
 CONFIG_BT_DATA_LEN_UPDATE=n

samples/bluetooth/hci_uart/boards/nrf51_blenano.conf

@@ -0,0 +1,8 @@
+CONFIG_GPIO=y
+CONFIG_UART_0_NRF_FLOW_CONTROL=y
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_BT_MAX_CONN=16
+CONFIG_BT_TINYCRYPT_ECC=n
+CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y

samples/bluetooth/hci_uart/boards/nrf51_pca10028.conf

@@ -0,0 +1,8 @@
+CONFIG_GPIO=y
+CONFIG_UART_0_NRF_FLOW_CONTROL=y
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_BT_MAX_CONN=16
+CONFIG_BT_TINYCRYPT_ECC=n
+CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y

samples/bluetooth/hci_uart/boards/nrf52840_pca10056.conf

@@ -0,0 +1,8 @@
+CONFIG_GPIO=y
+CONFIG_UART_0_NRF_FLOW_CONTROL=y
+CONFIG_MAIN_STACK_SIZE=1024
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_BT_MAX_CONN=16
+CONFIG_BT_TINYCRYPT_ECC=n
+CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y

samples/bluetooth/hci_uart/boards/nrf52840_pca10090.conf

@@ -1,10 +1,12 @@
+# Override prj.conf defaults
+CONFIG_CONSOLE=y
+CONFIG_STDOUT_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
 CONFIG_GPIO=y
-CONFIG_SERIAL=y
 CONFIG_MAIN_STACK_SIZE=512
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
-CONFIG_BT=y
 CONFIG_BT_WAIT_NOP=y
-CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=16
 CONFIG_BT_TINYCRYPT_ECC=n
 CONFIG_BT_CTLR_DTM_HCI=y
@@ -22,4 +24,3 @@ CONFIG_BOARD_PCA10090_NRF52840_RESET_P1_02=y
 # Use UART1 for HCI
 CONFIG_UART_1_NRF_UARTE=y
 CONFIG_UART_1_NRF_FLOW_CONTROL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y

samples/bluetooth/hci_uart/boards/nrf52_blenano2.conf

@@ -0,0 +1,8 @@
+CONFIG_GPIO=y
+CONFIG_UART_0_NRF_FLOW_CONTROL=y
+CONFIG_MAIN_STACK_SIZE=1024
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_BT_MAX_CONN=16
+CONFIG_BT_TINYCRYPT_ECC=n
+CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y

samples/bluetooth/hci_uart/boards/nrf52_pca10040.conf

@@ -0,0 +1,8 @@
+CONFIG_GPIO=y
+CONFIG_UART_0_NRF_FLOW_CONTROL=y
+CONFIG_MAIN_STACK_SIZE=1024
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_BT_MAX_CONN=16
+CONFIG_BT_TINYCRYPT_ECC=n
+CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y

samples/bluetooth/hci_uart/boards/nrf53_dk_nrf5340_cpuapp.conf

@@ -0,0 +1,8 @@
+CONFIG_GPIO=y
+CONFIG_UART_0_NRF_FLOW_CONTROL=y
+CONFIG_MAIN_STACK_SIZE=1024
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_BT_MAX_CONN=16
+CONFIG_BT_TINYCRYPT_ECC=n
+CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y

samples/bluetooth/hci_uart/sample.yaml

@@ -9,7 +9,6 @@ tests:
     tags: uart bluetooth
   sample.bluetooth.hci_uart.nrf5:
     harness: bluetooth
-    extra_args: CONF_FILE="nrf5.conf"
     platform_whitelist: 96b_nitrogen nrf51_pca10028
       nrf52_pca10040
     tags: uart bluetooth