From 49391249eed969370bde448ef33ee95064904e31 Mon Sep 17 00:00:00 2001 From: Joakim Andersson Date: Wed, 26 Feb 2020 12:35:03 +0100 Subject: [PATCH] Bluetooth: samples: hci_uart: Refactor conf files Refactor conf files to use prj.conf + 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 --- samples/bluetooth/hci_uart/CMakeLists.txt | 9 --------- .../hci_uart/{nrf5.conf => boards/96b_nitrogen.conf} | 7 ------- .../hci_uart/{microbit.conf => boards/bbc_microbit.conf} | 7 ------- samples/bluetooth/hci_uart/boards/nrf51_blenano.conf | 8 ++++++++ samples/bluetooth/hci_uart/boards/nrf51_pca10028.conf | 8 ++++++++ samples/bluetooth/hci_uart/boards/nrf52840_pca10056.conf | 8 ++++++++ .../hci_uart/{ => boards}/nrf52840_pca10090.conf | 9 +++++---- samples/bluetooth/hci_uart/boards/nrf52_blenano2.conf | 8 ++++++++ samples/bluetooth/hci_uart/boards/nrf52_pca10040.conf | 8 ++++++++ .../hci_uart/boards/nrf53_dk_nrf5340_cpuapp.conf | 8 ++++++++ .../hci_uart/{ => boards}/rv32m1_vega_ri5cy.conf | 0 samples/bluetooth/hci_uart/{generic.conf => prj.conf} | 0 samples/bluetooth/hci_uart/sample.yaml | 1 - 13 files changed, 53 insertions(+), 28 deletions(-) rename samples/bluetooth/hci_uart/{nrf5.conf => boards/96b_nitrogen.conf} (60%) rename samples/bluetooth/hci_uart/{microbit.conf => boards/bbc_microbit.conf} (58%) create mode 100644 samples/bluetooth/hci_uart/boards/nrf51_blenano.conf create mode 100644 samples/bluetooth/hci_uart/boards/nrf51_pca10028.conf create mode 100644 samples/bluetooth/hci_uart/boards/nrf52840_pca10056.conf rename samples/bluetooth/hci_uart/{ => boards}/nrf52840_pca10090.conf (85%) create mode 100644 samples/bluetooth/hci_uart/boards/nrf52_blenano2.conf create mode 100644 samples/bluetooth/hci_uart/boards/nrf52_pca10040.conf create mode 100644 samples/bluetooth/hci_uart/boards/nrf53_dk_nrf5340_cpuapp.conf rename samples/bluetooth/hci_uart/{ => boards}/rv32m1_vega_ri5cy.conf (100%) rename samples/bluetooth/hci_uart/{generic.conf => prj.conf} (100%) diff --git a/samples/bluetooth/hci_uart/CMakeLists.txt b/samples/bluetooth/hci_uart/CMakeLists.txt index 89b45eff92e..5aff9dedb3e 100644 --- a/samples/bluetooth/hci_uart/CMakeLists.txt +++ b/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) diff --git a/samples/bluetooth/hci_uart/nrf5.conf b/samples/bluetooth/hci_uart/boards/96b_nitrogen.conf similarity index 60% rename from samples/bluetooth/hci_uart/nrf5.conf rename to samples/bluetooth/hci_uart/boards/96b_nitrogen.conf index f8b88d11a76..5f610b9dd54 100644 --- a/samples/bluetooth/hci_uart/nrf5.conf +++ b/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 diff --git a/samples/bluetooth/hci_uart/microbit.conf b/samples/bluetooth/hci_uart/boards/bbc_microbit.conf similarity index 58% rename from samples/bluetooth/hci_uart/microbit.conf rename to samples/bluetooth/hci_uart/boards/bbc_microbit.conf index 5ed049f3470..bd1235868b2 100644 --- a/samples/bluetooth/hci_uart/microbit.conf +++ b/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 diff --git a/samples/bluetooth/hci_uart/boards/nrf51_blenano.conf b/samples/bluetooth/hci_uart/boards/nrf51_blenano.conf new file mode 100644 index 00000000000..da4d5a97663 --- /dev/null +++ b/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 diff --git a/samples/bluetooth/hci_uart/boards/nrf51_pca10028.conf b/samples/bluetooth/hci_uart/boards/nrf51_pca10028.conf new file mode 100644 index 00000000000..da4d5a97663 --- /dev/null +++ b/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 diff --git a/samples/bluetooth/hci_uart/boards/nrf52840_pca10056.conf b/samples/bluetooth/hci_uart/boards/nrf52840_pca10056.conf new file mode 100644 index 00000000000..5f610b9dd54 --- /dev/null +++ b/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 diff --git a/samples/bluetooth/hci_uart/nrf52840_pca10090.conf b/samples/bluetooth/hci_uart/boards/nrf52840_pca10090.conf similarity index 85% rename from samples/bluetooth/hci_uart/nrf52840_pca10090.conf rename to samples/bluetooth/hci_uart/boards/nrf52840_pca10090.conf index 3531d14332c..273f40d58b1 100644 --- a/samples/bluetooth/hci_uart/nrf52840_pca10090.conf +++ b/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 diff --git a/samples/bluetooth/hci_uart/boards/nrf52_blenano2.conf b/samples/bluetooth/hci_uart/boards/nrf52_blenano2.conf new file mode 100644 index 00000000000..5f610b9dd54 --- /dev/null +++ b/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 diff --git a/samples/bluetooth/hci_uart/boards/nrf52_pca10040.conf b/samples/bluetooth/hci_uart/boards/nrf52_pca10040.conf new file mode 100644 index 00000000000..5f610b9dd54 --- /dev/null +++ b/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 diff --git a/samples/bluetooth/hci_uart/boards/nrf53_dk_nrf5340_cpuapp.conf b/samples/bluetooth/hci_uart/boards/nrf53_dk_nrf5340_cpuapp.conf new file mode 100644 index 00000000000..5f610b9dd54 --- /dev/null +++ b/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 diff --git a/samples/bluetooth/hci_uart/rv32m1_vega_ri5cy.conf b/samples/bluetooth/hci_uart/boards/rv32m1_vega_ri5cy.conf similarity index 100% rename from samples/bluetooth/hci_uart/rv32m1_vega_ri5cy.conf rename to samples/bluetooth/hci_uart/boards/rv32m1_vega_ri5cy.conf diff --git a/samples/bluetooth/hci_uart/generic.conf b/samples/bluetooth/hci_uart/prj.conf similarity index 100% rename from samples/bluetooth/hci_uart/generic.conf rename to samples/bluetooth/hci_uart/prj.conf diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml index 718b1e7fb00..ecb4236b6c6 100644 --- a/samples/bluetooth/hci_uart/sample.yaml +++ b/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