michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: drivers: hci: Get rid of Kconfig choice

Browse source 
The drivers should be independent after the move to the new HCI driver
API. Having them as a choice also has unexpected consequences with some
drivers being unexpectedly enabled.

Signed-off-by: Johan Hedberg <johan.hedberg@gmail.com>
This commit is contained in:
Johan Hedberg 2024-05-06 16:15:43 +03:00 • committed by Anas Nashif
commit 97c3a1e4be
60 changed files with 117 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

5
boards/96boards/carbon/Kconfig.defconfig
View file

@ -14,9 +14,8 @@ if BT
config SPI
default y
choice BT_HCI_BUS_TYPE
default BT_SPI
endchoice
config BT_SPI
default y
endif # BT

5
boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig
View file

@ -9,9 +9,8 @@ if BT
config MAIN_STACK_SIZE
default 2048
choice BT_HCI_BUS_TYPE
default BT_AMBIQ_HCI
endchoice
config BT_AMBIQ_HCI
default y
config BT_BUF_ACL_TX_COUNT
default 14

5
boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_ESP32_DEVKITC_WROOM_ESP32_PROCPU

5
boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig
View file

@ -10,9 +10,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_ESP32_DEVKITC_WROVER_ESP32_PROCPU

5
boards/espressif/esp32_ethernet_kit/Kconfig.defconfig
View file

@ -19,9 +19,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_ESP32_ETHERNET_KIT_ESP32_PROCPU

5
boards/espressif/esp32c3_devkitm/Kconfig.defconfig
View file

@ -10,6 +10,5 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT

5
boards/espressif/esp32s3_devkitc/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_ESP32S3_DEVKITC_ESP32S3_PROCPU

5
boards/espressif/esp32s3_devkitm/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU

5
boards/espressif/esp_wrover_kit/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
config DISK_DRIVER_SDMMC
default y

5
boards/ezurio/bl5340_dvk/Kconfig.defconfig
View file

@ -57,9 +57,8 @@ config FLASH_LOAD_SIZE
endif # BOARD_BL5340_DVK_NRF5340_CPUAPP_NS
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config BT_HCI_IPC
default y if BT
config HEAP_MEM_POOL_ADD_SIZE_BOARD
int

5
boards/hardkernel/odroid_go/Kconfig.defconfig
View file

@ -25,9 +25,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_ODROID_GO_ESP32_PROCPU

5
boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_HELTEC_WIFI_LORA32_V2_ESP32_PROCPU

5
boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig
View file

@ -13,9 +13,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_PROCPU

7
boards/infineon/cy8cproto_062_4343w/Kconfig.defconfig
View file

@ -36,13 +36,6 @@ config UART
bool
default y
config BT_UART
default y
choice BT_HCI_BUS_TYPE
default BT_H4
endchoice
endif # BT
# Heap Pool Size

5
boards/infineon/cy8cproto_063_ble/Kconfig.defconfig
View file

@ -6,8 +6,7 @@
if BOARD_CY8CPROTO_063_BLE
choice BT_HCI_BUS_TYPE
default BT_PSOC6_BLESS if BT
endchoice
config BT_PSOC6_BLESS
default y if BT
endif # BOARD_CY8CPROTO_063_BLE

5
boards/kincony/kincony_kc868_a32/Kconfig.defconfig
View file

@ -10,9 +10,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_KINCONY_KC868_A32_ESP32_PROCPU

5
boards/luatos/esp32c3_luatos_core/Kconfig.defconfig
View file

@ -10,6 +10,5 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT

5
boards/luatos/esp32s3_luatos_core/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_ESP32S3_LUATOS_CORE_ESP32S3_PROCPU || BOARD_ESP32S3_LUATOS_CORE_ESP32S3_PROCPU_USB

5
boards/m5stack/m5stack_atom_lite/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_M5STACK_ATOM_LITE_ESP32_PROCPU

5
boards/m5stack/m5stack_atoms3/Kconfig.defconfig
View file

@ -14,9 +14,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_M5STACK_ATOMS3_ESP32S3_PROCPU

5
boards/m5stack/m5stack_atoms3_lite/Kconfig.defconfig
View file

@ -14,9 +14,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
config KERNEL_MEM_POOL
default y
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_M5STACK_ATOMS3_LITE_ESP32S3_PROCPU

5
boards/m5stack/m5stack_core2/Kconfig.defconfig
View file

@ -15,9 +15,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
config KERNEL_MEM_POOL
default y
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
config GPIO_HOGS_INIT_PRIORITY
default 70

5
boards/m5stack/m5stack_stamps3/Kconfig.defconfig
View file

@ -14,9 +14,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
config KERNEL_MEM_POOL
default y
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_M5STACK_STAMPS3_ESP32S3_PROCPU

5
boards/m5stack/m5stickc_plus/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
config GPIO_HOGS_INIT_PRIORITY
default 70

5
boards/m5stack/stamp_c3/Kconfig.defconfig
View file

@ -12,8 +12,7 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
if BT
choice BT_HCI_BUS_TYPE
default BT_ESP32
endchoice
config BT_ESP32
default y
endif # BT

5
boards/native/native_posix/Kconfig.defconfig
View file

@ -22,10 +22,9 @@ config ETH_NATIVE_POSIX
endif # NETWORKING
choice BT_HCI_BUS_TYPE
default BT_USERCHAN
config BT_USERCHAN
default y
depends on BT_HCI
endchoice
if CONSOLE

5
boards/native/native_sim/Kconfig.defconfig
View file

@ -22,10 +22,9 @@ config ETH_NATIVE_POSIX
endif # NETWORKING
choice BT_HCI_BUS_TYPE
default BT_USERCHAN
config BT_USERCHAN
depends on BT_HCI
endchoice
default y
if CONSOLE

5
boards/native/nrf_bsim/Kconfig.defconfig
View file

@ -60,9 +60,8 @@ if BOARD_NRF5340BSIM_NRF5340_CPUAPP
config IPC_SERVICE_BACKEND_RPMSG_SHMEM_RESET
default y if IPC_SERVICE_BACKEND_RPMSG
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC
endchoice
config BT_HCI_IPC
default y if BT
endif # BOARD_NRF5340BSIM_NRF5340_CPUAPP

5
boards/nordic/nrf5340_audio_dk/Kconfig.defconfig
View file

@ -53,9 +53,8 @@ config FLASH_LOAD_SIZE
endif # BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config BT_HCI_IPC
default y if BT
config HEAP_MEM_POOL_ADD_SIZE_BOARD
int

5
boards/nordic/nrf5340dk/Kconfig.defconfig
View file

@ -60,9 +60,8 @@ config MBOX_NRFX_IPC
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config BT_HCI_IPC
default y if BT
config HEAP_MEM_POOL_ADD_SIZE_BOARD
int

5
boards/nordic/nrf54h20dk/Kconfig.defconfig
View file

@ -3,9 +3,8 @@
if BOARD_NRF54H20DK_NRF54H20_CPUAPP
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config BT_HCI_IPC
default y if BT
endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP

5
boards/nordic/thingy53/Kconfig.defconfig
View file

@ -55,9 +55,8 @@ endif # BOARD_THINGY53_NRF5340_CPUAPP_NS
if !TRUSTED_EXECUTION_SECURE
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config BT_HCI_IPC
default y if BT
config HEAP_MEM_POOL_ADD_SIZE_BOARD
int

5
boards/olimex/olimex_esp32_evb/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_OLIMEX_ESP32_EVB_ESP32_PROCPU

5
boards/others/icev_wireless/Kconfig.defconfig
View file

@ -8,6 +8,5 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT

5
boards/panasonic/pan1783/Kconfig.defconfig
View file

@ -8,9 +8,8 @@ config MBOX_NRFX_IPC
if SOC_NRF5340_CPUAPP_QKAA
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config BT_HCI_IPC
default y if BT
config HEAP_MEM_POOL_ADD_SIZE_BOARD
int

5
boards/raytac/mdbt53_db_40/Kconfig.defconfig
View file

@ -53,9 +53,8 @@ config FLASH_LOAD_SIZE
endif # BOARD_RAYTAC_MDBT53_DB_40_NRF5340_CPUAPP_NS
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config BT_HCI_IPC
default y if BT
config HEAP_MEM_POOL_ADD_SIZE_BOARD
int

5
boards/raytac/mdbt53v_db_40/Kconfig.defconfig
View file

@ -53,9 +53,8 @@ config FLASH_LOAD_SIZE
endif # BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice
config BT_HCI_IPC
default y if BT
config HEAP_MEM_POOL_ADD_SIZE_BOARD
int

5
boards/renesas/da1469x_dk_pro/Kconfig.defconfig
View file

@ -64,9 +64,8 @@ endif # PM || PM_DEVICE
if BT
choice BT_HCI_BUS_TYPE
default BT_DA1469X
endchoice
config BT_DA1469X
default y
config BT_WAIT_NOP
default y

5
boards/seeed/xiao_esp32c3/Kconfig.defconfig
View file

@ -8,6 +8,5 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT

5
boards/seeed/xiao_esp32s3/Kconfig.defconfig
View file

@ -10,9 +10,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_XIAO_ESP32S3_ESP32S3_PROCPU

5
boards/shields/x_nucleo_bnrg2a1/Kconfig.defconfig
View file

@ -8,9 +8,8 @@ if BT
config SPI
default y
choice BT_HCI_BUS_TYPE
default BT_SPI
endchoice
config BT_SPI
default y
config BT_BLUENRG_ACI
default y

5
boards/shields/x_nucleo_idb05a1/Kconfig.defconfig
View file

@ -8,9 +8,8 @@ if BT
config SPI
default y
choice BT_HCI_BUS_TYPE
default BT_SPI
endchoice
config BT_SPI
default y
config BT_BLUENRG_ACI
default y

5
boards/silabs/efr32_radio/Kconfig.defconfig
View file

@ -42,9 +42,8 @@ config MAIN_STACK_SIZE
default 3072 if PM
default 2304
choice BT_HCI_BUS_TYPE
default BT_SILABS_HCI
endchoice
config BT_SILABS_HCI
default y
endif # BT

5
boards/silabs/efr32_thunderboard/Kconfig.defconfig
View file

@ -28,9 +28,8 @@ config MAIN_STACK_SIZE
default 3072 if PM
default 2304
choice BT_HCI_BUS_TYPE
default BT_SILABS_HCI
endchoice
config BT_SILABS_HCI
default y
endif # BT

5
boards/silabs/efr32xg24_dk2601b/Kconfig.defconfig
View file

@ -33,9 +33,8 @@ config MINIMAL_LIBC_MALLOC_ARENA_SIZE
config MAIN_STACK_SIZE
default 2304
choice BT_HCI_BUS_TYPE
default BT_SILABS_HCI
endchoice
config BT_SILABS_HCI
default y
if SHELL

5
boards/st/b_l4s5i_iot01a/Kconfig.defconfig
View file

@ -27,9 +27,8 @@ if BT
config SPI
default y
choice BT_HCI_BUS_TYPE
default BT_SPI
endchoice
config BT_SPI
default y
config BT_BLUENRG_ACI
default y

5
boards/st/disco_l475_iot1/Kconfig.defconfig
View file

@ -27,9 +27,8 @@ if BT
config SPI
default y
choice BT_HCI_BUS_TYPE
default BT_SPI
endchoice
config BT_SPI
default y
config BT_BLUENRG_ACI
default y

5
boards/st/nucleo_wb55rg/Kconfig.defconfig
View file

@ -5,9 +5,8 @@
if BOARD_NUCLEO_WB55RG
choice BT_HCI_BUS_TYPE
default BT_STM32_IPM
config BT_STM32_IPM
default y
depends on BT
endchoice
endif

5
boards/st/sensortile_box/Kconfig.defconfig
View file

@ -10,9 +10,8 @@ if BT
config SPI
default y
choice BT_HCI_BUS_TYPE
default BT_SPI
endchoice
config BT_SPI
default y
config BT_BLUENRG_ACI
default y

5
boards/st/sensortile_box_pro/Kconfig.defconfig
View file

@ -10,9 +10,8 @@ if BT
config SPI
default y
choice BT_HCI_BUS_TYPE
default BT_SPI
endchoice
config BT_SPI
default y
config BT_BLUENRG_ACI
default y

5
boards/st/steval_stwinbx1/Kconfig.defconfig
View file

@ -10,9 +10,8 @@ if BT
config SPI
default y
choice BT_HCI_BUS_TYPE
default BT_SPI
endchoice
config BT_SPI
default y
config BT_BLUENRG_ACI
default y

5
boards/st/stm32l562e_dk/Kconfig.defconfig
View file

@ -10,9 +10,8 @@ if BT
config SPI
default y
choice BT_HCI_BUS_TYPE
default BT_SPI
endchoice
config BT_SPI
default y
config BT_BLUENRG_ACI
default y

5
boards/st/stm32wb5mm_dk/Kconfig.defconfig
View file

@ -5,9 +5,8 @@
if BOARD_STM32WB5MM_DK
choice BT_HCI_BUS_TYPE
default BT_STM32_IPM
config BT_STM32_IPM
default y
depends on BT
endchoice
endif

5
boards/st/stm32wb5mmg/Kconfig.defconfig
View file

@ -5,9 +5,8 @@
if BOARD_STM32WB5MMG
choice BT_HCI_BUS_TYPE
default BT_STM32_IPM
config BT_STM32_IPM
default y
depends on BT
endchoice
endif

5
boards/vcc-gnd/yd_esp32/Kconfig.defconfig
View file

@ -12,9 +12,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_YD_ESP32_ESP32_PROCPU

5
boards/waveshare/esp32s3_touch_lcd_1_28/Kconfig.defconfig
View file

@ -10,9 +10,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
default 40960 if BT
default 4096
choice BT_HCI_BUS_TYPE
default BT_ESP32 if BT
endchoice
config BT_ESP32
default y if BT
endif # BOARD_ESP32S3_TOUCH_LCD_1_28_ESP32S3_PROCPU

6
drivers/bluetooth/hci/Kconfig
View file

@ -10,10 +10,6 @@ config BT_UART
select SERIAL
select UART_INTERRUPT_DRIVEN
choice BT_HCI_BUS_TYPE
prompt "Bluetooth HCI driver"
config BT_H4
bool "H:4 UART"
select BT_UART
@ -137,8 +133,6 @@ config BT_AMBIQ_HCI
Supports Ambiq Bluetooth SoC using SPI as the communication protocol.
HCI packets are sent and received as single Byte transfers.
endchoice
if BT_SPI
config BT_SPI_INIT_PRIORITY

5
soc/nxp/rw/Kconfig.defconfig
View file

@ -85,9 +85,8 @@ if BT
config FLASH
default y
choice BT_HCI_BUS_TYPE
default BT_NXP
endchoice
config BT_NXP
default y
config BT_DIS_MANUF
default "NXP"

5
soc/st/stm32/stm32wbax/Kconfig.defconfig
View file

@ -13,10 +13,9 @@ config STM32_LPTIM_TIMER
config STM32_FLASH_PREFETCH
default y
choice BT_HCI_BUS_TYPE
default BT_STM32WBA
config BT_STM32WBA
depends on BT
endchoice
default y
config BT_STM32WBA
select DYNAMIC_INTERRUPTS

8
subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.defconfig
View file

@ -2,12 +2,10 @@
#
# Copyright (c) 2022 Nordic Semiconductor
# Bluetooth unit tests expect this backend
choice BT_HCI_BUS_TYPE
default BT_NO_DRIVER
endchoice
# Controller HCI support requires e.g. devicetree, which isn't available
# for unit tests.
config BT_CTLR_HCI
default n
config BT_NO_DRIVER
default y