Skip to content

kconfig: drivers: bluetooth: clean up Kconfig dependencies #14314

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 5 commits into from
Mar 12, 2019
Merged

kconfig: drivers: bluetooth: clean up Kconfig dependencies #14314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e167c1
kconfig: Use depend on instead of select to avoid kconfig loop
Feb 21, 2019
ff3983a
kconfig: bluetooth: Let BT_HCI_VS be configurable from controller
Feb 21, 2019
268f0ab
drivers: nrf5: Don't force specific drivers from soc/arm/nordic_nrf
Feb 21, 2019
b259bce
drivers: clock_control: nrf: add choice variable
Feb 21, 2019
ab3a94e
bluetooth: host: Specify controller in BT_HCI_TX_STACK_SIZE defaults
Feb 21, 2019
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
1 change: 0 additions & 1 deletion boards/posix/nrf52_bsim/Kconfig.board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ config BOARD_NRF52_BSIM
select CONSOLE_HAS_DRIVER
select NRF_RTC_TIMER
select CLOCK_CONTROL
select CLOCK_CONTROL_NRF
help
Will produce a console Linux process which can be executed natively.
It needs the BabbleSim simulator both in compile time and to execute
5 changes: 3 additions & 2 deletions drivers/clock_control/Kconfig.nrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
menuconfig CLOCK_CONTROL_NRF
bool "NRF Clock controller support"
depends on SOC_COMPATIBLE_NRF
default y
help
Enable support for the Nordic Semiconductor nRFxx series SoC clock
driver.

if CLOCK_CONTROL_NRF

choice
choice CLOCK_CONTROL_NRF_SOURCE
prompt "32KHz clock source"
default CLOCK_CONTROL_NRF_K32SRC_XTAL

Expand All @@ -34,7 +35,7 @@ config CLOCK_CONTROL_NRF_K32SRC_BLOCKING
initially start running and automatically switch to crystal when
ready.

choice
choice CLOCK_CONTROL_NRF_ACCURACY
prompt "32KHz clock accuracy"
default CLOCK_CONTROL_NRF_K32SRC_500PPM if CLOCK_CONTROL_NRF_K32SRC_RC
default CLOCK_CONTROL_NRF_K32SRC_20PPM
Expand Down
2 changes: 1 addition & 1 deletion drivers/entropy/Kconfig.nrf5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ menuconfig ENTROPY_NRF5_RNG
bool "nRF5 RNG driver"
depends on SOC_COMPATIBLE_NRF
select ENTROPY_HAS_DRIVER
default y
help
This option enables the RNG peripheral, which is a random number
generator, based on internal thermal noise, that provides a
Expand Down Expand Up @@ -59,7 +60,6 @@ config ENTROPY_NRF5_ISR_THRESHOLD
buffer goes below this number hardware entropy generation will be
started.


config ENTROPY_NRF5_PRI
int "RNG interrupt priority"
range 0 2 if SOC_SERIES_NRF51X
Expand Down
1 change: 1 addition & 0 deletions drivers/flash/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ config FLASH_SHELL
config FLASH_PAGE_LAYOUT
bool "API for retrieving the layout of pages"
depends on FLASH_HAS_PAGE_LAYOUT
default y
help
Enables API for retrieving the layout of flash memory pages.

Expand Down
1 change: 1 addition & 0 deletions drivers/flash/Kconfig.nrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ config SOC_FLASH_NRF
depends on SOC_FAMILY_NRF
select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED
default y
help
Enables Nordic Semiconductor nRF flash driver.

Expand Down
3 changes: 2 additions & 1 deletion drivers/timer/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ config ALTERA_AVALON_TIMER
config NRF_RTC_TIMER
bool "nRF Real Time Counter (NRF_RTC1) Timer"
default y
depends on CLOCK_CONTROL_NRF
depends on CLOCK_CONTROL
depends on SOC_COMPATIBLE_NRF
select TICKLESS_CAPABLE
help
This module implements a kernel device driver for the nRF Real Time
Expand Down
1 change: 1 addition & 0 deletions samples/bluetooth/ipsp/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CONFIG_BT=y
CONFIG_BT_DEBUG_LOG=y
CONFIG_BT_SMP=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BT_DEVICE_NAME="Test IPSP node"
CONFIG_NETWORKING=y
Expand Down
1 change: 1 addition & 0 deletions samples/bluetooth/ipsp/prj_dbg.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CONFIG_BT=y
CONFIG_BT_DEBUG_LOG=y
CONFIG_BT_SMP=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BT_DEVICE_NAME="Test IPSP node"
CONFIG_NETWORKING=y
Expand Down
1 change: 1 addition & 0 deletions samples/bluetooth/ipsp/prj_zep1656.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CONFIG_BT=y
CONFIG_BT_DEBUG_LOG=y
CONFIG_BT_SMP=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BT_DEVICE_NAME="Test IPSP node"
CONFIG_NETWORKING=y
Expand Down
14 changes: 0 additions & 14 deletions soc/arm/nordic_nrf/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,6 @@ source "soc/arm/nordic_nrf/*/Kconfig.defconfig.series"
config BUILD_OUTPUT_HEX
default y

if FLASH

config SOC_FLASH_NRF
default y

endif # FLASH

if ENTROPY_GENERATOR

config ENTROPY_NRF5_RNG
default y

endif # ENTROPY_GENERATOR

if SPI

config GPIO
Expand Down
1 change: 0 additions & 1 deletion soc/arm/nordic_nrf/nrf51/Kconfig.series
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ config SOC_SERIES_NRF51X
select SOC_FAMILY_NRF
select NRF_RTC_TIMER
select CLOCK_CONTROL
select CLOCK_CONTROL_NRF
select HAS_STATE_DEEP_SLEEP_1
select XIP
select HAS_CMSIS
Expand Down
1 change: 0 additions & 1 deletion soc/arm/nordic_nrf/nrf52/Kconfig.series
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ config SOC_SERIES_NRF52X
select SOC_FAMILY_NRF
select NRF_RTC_TIMER
select CLOCK_CONTROL
select CLOCK_CONTROL_NRF
select HAS_STATE_DEEP_SLEEP_1
select XIP
select HAS_CMSIS
Expand Down
1 change: 0 additions & 1 deletion soc/arm/nordic_nrf/nrf91/Kconfig.series
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ config SOC_SERIES_NRF91X
select SOC_FAMILY_NRF
select NRF_RTC_TIMER
select CLOCK_CONTROL
select CLOCK_CONTROL_NRF
select HAS_STATE_DEEP_SLEEP_1
select XIP
select HAS_CMSIS
Expand Down
7 changes: 7 additions & 0 deletions subsys/bluetooth/common/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@
# SPDX-License-Identifier: Apache-2.0
#

config BT_HAS_HCI_VS
bool
help
This option is set by the Bluetooth controller to indicate support
for the Zephyr HCI Vendor-Specific Commands and Event.

config BT_HCI_VS
bool "Zephyr HCI Vendor-Specific Commands"
depends on BT_HAS_HCI_VS
default y
help
Enable support for the Zephyr HCI Vendor-Specific Commands in the
Expand Down
1 change: 1 addition & 0 deletions subsys/bluetooth/controller/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ choice BT_LL_CHOICE
config BT_LL_SW
bool "Software-based BLE Link Layer"
select BT_RECV_IS_RX_THREAD
select BT_HAS_HCI_VS
select ENTROPY_GENERATOR
select ENTROPY_NRF5_RNG if SOC_COMPATIBLE_NRF
select ENTROPY_NRF5_BIAS_CORRECTION if SOC_COMPATIBLE_NRF
Expand Down
13 changes: 8 additions & 5 deletions subsys/bluetooth/host/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,20 @@ config BT_RX_BUF_LEN
(4 bytes) and the ACL header (also 4 bytes) which yields 73 bytes.

config BT_HCI_TX_STACK_SIZE
# NOTE: This value is derived from other symbols and should not be
# user-configurable. Do not give it a prompt.
int
default 512 if BT_H4
default 512 if BT_H5
default 416 if BT_SPI
default 940 if BT_CTLR && NO_OPTIMIZATIONS
default 1024 if BT_CTLR && BT_CENTRAL
default 640 if BT_CTLR
default 940 if BT_CTLR && (BT_LL_SW || BT_LL_SW_SPLIT) && NO_OPTIMIZATIONS
default 1024 if BT_CTLR && (BT_LL_SW || BT_LL_SW_SPLIT) && BT_CENTRAL
default 640 if BT_CTLR && (BT_LL_SW || BT_LL_SW_SPLIT)
default 512 if BT_USERCHAN
# Even if no driver is selected the following default is still
# needed e.g. for unit tests.
default 512
# needed e.g. for unit tests. This default will also server as
# the worst-case stack size if an out-of-tree controller is used.
default 1024
Copy link
Member

@carlescufi carlescufi Mar 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change the default here?

Copy link
Member Author

@thomasstenersen thomasstenersen Mar 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To accommodate the worst case stack requirement if an out-of-tree controller is used. I'll add a comment in the code here and in the commit with the reasoning.

help
Stack size needed for executing bt_send with specified driver

Expand Down
2 changes: 1 addition & 1 deletion subsys/fs/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ config FAT_FILESYSTEM_ELM

config FILE_SYSTEM_NFFS
bool "NFFS file system support"
select FLASH_PAGE_LAYOUT
depends on FLASH_PAGE_LAYOUT
select FS_FLASH_STORAGE_PARTITION
help
Enables NFFS file system support.
Expand Down
10 changes: 5 additions & 5 deletions subsys/net/l2/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ config NET_L2_DUMMY
config NET_L2_BT
bool "Enable Bluetooth support"
depends on NET_IPV6
select BT
select BT_PERIPHERAL
select BT_CENTRAL
select BT_SMP
select BT_L2CAP_DYNAMIC_CHANNEL
depends on BT
depends on BT_PERIPHERAL
depends on BT_CENTRAL
depends on BT_SMP
depends on BT_L2CAP_DYNAMIC_CHANNEL
select NET_6LO
help
Enable Bluetooth driver that send and receives IPv6 packets,
Expand Down
6 changes: 6 additions & 0 deletions tests/net/all/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ CONFIG_NET_L2_IEEE802154_SECURITY=y
CONFIG_NET_L2_IEEE802154_SECURITY_CRYPTO_DEV_NAME="CRYPTO-DEV"
CONFIG_NET_L2_DUMMY=y
CONFIG_NET_L2_ETHERNET=y

CONFIG_BT=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_SMP=y
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_NET_L2_BT=y
CONFIG_NET_L2_BT_ZEP1656=y
CONFIG_NET_L2_BT_SEC_LEVEL=4
Expand Down