Bluetooth: drivers: hci: Get rid of Kconfig choice

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -2,12 +2,10 @@
# #
# Copyright (c) 2022 Nordic Semiconductor # 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 # Controller HCI support requires e.g. devicetree, which isn't available
# for unit tests. # for unit tests.
config BT_CTLR_HCI config BT_CTLR_HCI
default n default n
config BT_NO_DRIVER
default y