Skip to content

Bluetooth: HCI_UART: Update main stack and refactor conf files #23104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 13, 2020
Merged

Bluetooth: HCI_UART: Update main stack and refactor conf files #23104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
005497a
Bluetooth: samples: hci_uart: Update main stack size nrf5 boards
joerchan Feb 26, 2020
5e9de90
Bluetooth: samples: hci_uart: Refactor conf files
joerchan Feb 26, 2020
88e00dc
Bluetooth: samples: hci_uart: Remove unsupported configuration
joerchan Feb 26, 2020
a935834
Bluetooth: samples: hci_uart: Remove unneeded config options
joerchan Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions samples/bluetooth/hci_uart/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 8 additions & 0 deletions samples/bluetooth/hci_uart/boards/96b_nitrogen.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions samples/bluetooth/hci_uart/boards/bbc_microbit.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CONFIG_GPIO=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_MAX_CONN=10
7 changes: 0 additions & 7 deletions samples/bluetooth/hci_uart/nrf5.conf → ...etooth/hci_uart/boards/nrf51_blenano.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=512
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
Expand Down
8 changes: 8 additions & 0 deletions samples/bluetooth/hci_uart/boards/nrf51_pca10028.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions samples/bluetooth/hci_uart/boards/nrf52840_pca10056.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
9 changes: 5 additions & 4 deletions ...bluetooth/hci_uart/nrf52840_pca10090.conf → ...th/hci_uart/boards/nrf52840_pca10090.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
8 changes: 8 additions & 0 deletions samples/bluetooth/hci_uart/boards/nrf52_blenano2.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions samples/bluetooth/hci_uart/boards/nrf52_pca10040.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions samples/bluetooth/hci_uart/boards/nrf53_dk_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion ...bluetooth/hci_uart/rv32m1_vega_ri5cy.conf → ...th/hci_uart/boards/rv32m1_vega_ri5cy.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ CONFIG_BT=y
CONFIG_BT_HCI_RAW=y
CONFIG_BT_MAX_CONN=16
CONFIG_BT_TINYCRYPT_ECC=n
CONFIG_BT_CTLR_DTM_HCI=y
CONFIG_BT_CTLR_ASSERT_HANDLER=y

CONFIG_UART_RV32M1_LPUART_0=y
Expand Down
15 changes: 0 additions & 15 deletions samples/bluetooth/hci_uart/microbit.conf
View file
Open in desktop

This file was deleted.

0 samples/bluetooth/hci_uart/generic.conf → samples/bluetooth/hci_uart/prj.conf
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion samples/bluetooth/hci_uart/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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