From 97c3a1e4be035a1a6b366fe6135a91696ed48d5b Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@gmail.com>
Date: Mon, 6 May 2024 16:15:43 +0300
Subject: [PATCH] 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>
---
 boards/96boards/carbon/Kconfig.defconfig                  | 5 ++---
 boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig      | 5 ++---
 boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig    | 5 ++---
 boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig   | 5 ++---
 boards/espressif/esp32_ethernet_kit/Kconfig.defconfig     | 5 ++---
 boards/espressif/esp32c3_devkitm/Kconfig.defconfig        | 5 ++---
 boards/espressif/esp32s3_devkitc/Kconfig.defconfig        | 5 ++---
 boards/espressif/esp32s3_devkitm/Kconfig.defconfig        | 5 ++---
 boards/espressif/esp_wrover_kit/Kconfig.defconfig         | 5 ++---
 boards/ezurio/bl5340_dvk/Kconfig.defconfig                | 5 ++---
 boards/hardkernel/odroid_go/Kconfig.defconfig             | 5 ++---
 boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig     | 5 ++---
 .../heltec_wireless_stick_lite_v3/Kconfig.defconfig       | 5 ++---
 boards/infineon/cy8cproto_062_4343w/Kconfig.defconfig     | 7 -------
 boards/infineon/cy8cproto_063_ble/Kconfig.defconfig       | 5 ++---
 boards/kincony/kincony_kc868_a32/Kconfig.defconfig        | 5 ++---
 boards/luatos/esp32c3_luatos_core/Kconfig.defconfig       | 5 ++---
 boards/luatos/esp32s3_luatos_core/Kconfig.defconfig       | 5 ++---
 boards/m5stack/m5stack_atom_lite/Kconfig.defconfig        | 5 ++---
 boards/m5stack/m5stack_atoms3/Kconfig.defconfig           | 5 ++---
 boards/m5stack/m5stack_atoms3_lite/Kconfig.defconfig      | 5 ++---
 boards/m5stack/m5stack_core2/Kconfig.defconfig            | 5 ++---
 boards/m5stack/m5stack_stamps3/Kconfig.defconfig          | 5 ++---
 boards/m5stack/m5stickc_plus/Kconfig.defconfig            | 5 ++---
 boards/m5stack/stamp_c3/Kconfig.defconfig                 | 5 ++---
 boards/native/native_posix/Kconfig.defconfig              | 5 ++---
 boards/native/native_sim/Kconfig.defconfig                | 5 ++---
 boards/native/nrf_bsim/Kconfig.defconfig                  | 5 ++---
 boards/nordic/nrf5340_audio_dk/Kconfig.defconfig          | 5 ++---
 boards/nordic/nrf5340dk/Kconfig.defconfig                 | 5 ++---
 boards/nordic/nrf54h20dk/Kconfig.defconfig                | 5 ++---
 boards/nordic/thingy53/Kconfig.defconfig                  | 5 ++---
 boards/olimex/olimex_esp32_evb/Kconfig.defconfig          | 5 ++---
 boards/others/icev_wireless/Kconfig.defconfig             | 5 ++---
 boards/panasonic/pan1783/Kconfig.defconfig                | 5 ++---
 boards/raytac/mdbt53_db_40/Kconfig.defconfig              | 5 ++---
 boards/raytac/mdbt53v_db_40/Kconfig.defconfig             | 5 ++---
 boards/renesas/da1469x_dk_pro/Kconfig.defconfig           | 5 ++---
 boards/seeed/xiao_esp32c3/Kconfig.defconfig               | 5 ++---
 boards/seeed/xiao_esp32s3/Kconfig.defconfig               | 5 ++---
 boards/shields/x_nucleo_bnrg2a1/Kconfig.defconfig         | 5 ++---
 boards/shields/x_nucleo_idb05a1/Kconfig.defconfig         | 5 ++---
 boards/silabs/efr32_radio/Kconfig.defconfig               | 5 ++---
 boards/silabs/efr32_thunderboard/Kconfig.defconfig        | 5 ++---
 boards/silabs/efr32xg24_dk2601b/Kconfig.defconfig         | 5 ++---
 boards/st/b_l4s5i_iot01a/Kconfig.defconfig                | 5 ++---
 boards/st/disco_l475_iot1/Kconfig.defconfig               | 5 ++---
 boards/st/nucleo_wb55rg/Kconfig.defconfig                 | 5 ++---
 boards/st/sensortile_box/Kconfig.defconfig                | 5 ++---
 boards/st/sensortile_box_pro/Kconfig.defconfig            | 5 ++---
 boards/st/steval_stwinbx1/Kconfig.defconfig               | 5 ++---
 boards/st/stm32l562e_dk/Kconfig.defconfig                 | 5 ++---
 boards/st/stm32wb5mm_dk/Kconfig.defconfig                 | 5 ++---
 boards/st/stm32wb5mmg/Kconfig.defconfig                   | 5 ++---
 boards/vcc-gnd/yd_esp32/Kconfig.defconfig                 | 5 ++---
 boards/waveshare/esp32s3_touch_lcd_1_28/Kconfig.defconfig | 5 ++---
 drivers/bluetooth/hci/Kconfig                             | 6 ------
 soc/nxp/rw/Kconfig.defconfig                              | 5 ++---
 soc/st/stm32/stm32wbax/Kconfig.defconfig                  | 5 ++---
 .../boards/unit_testing/unit_testing/Kconfig.defconfig    | 8 +++-----
 60 files changed, 117 insertions(+), 189 deletions(-)

diff --git a/boards/96boards/carbon/Kconfig.defconfig b/boards/96boards/carbon/Kconfig.defconfig
index cede46b95fe..2cf1bbdc6fc 100644
--- a/boards/96boards/carbon/Kconfig.defconfig
+++ b/boards/96boards/carbon/Kconfig.defconfig
@@ -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
 
diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig b/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig
index 87e1c5a8764..46d8af8ef95 100644
--- a/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig
+++ b/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig
@@ -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
diff --git a/boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig b/boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig
index 6da35bf9735..3cafb138007 100644
--- a/boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig
+++ b/boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig
@@ -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
 
diff --git a/boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig b/boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig
index ba249b4a0a6..e2c3cf70383 100644
--- a/boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig
+++ b/boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig
@@ -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
 
diff --git a/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig b/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig
index c1c49d1e0fd..d5957ffa62a 100644
--- a/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig
+++ b/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig
@@ -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
 
diff --git a/boards/espressif/esp32c3_devkitm/Kconfig.defconfig b/boards/espressif/esp32c3_devkitm/Kconfig.defconfig
index 9944bb87195..9cd90fc1caf 100644
--- a/boards/espressif/esp32c3_devkitm/Kconfig.defconfig
+++ b/boards/espressif/esp32c3_devkitm/Kconfig.defconfig
@@ -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
diff --git a/boards/espressif/esp32s3_devkitc/Kconfig.defconfig b/boards/espressif/esp32s3_devkitc/Kconfig.defconfig
index 9b109ab4525..a85e047ceae 100644
--- a/boards/espressif/esp32s3_devkitc/Kconfig.defconfig
+++ b/boards/espressif/esp32s3_devkitc/Kconfig.defconfig
@@ -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
 
diff --git a/boards/espressif/esp32s3_devkitm/Kconfig.defconfig b/boards/espressif/esp32s3_devkitm/Kconfig.defconfig
index 1905ae5f551..e24f82b64a6 100644
--- a/boards/espressif/esp32s3_devkitm/Kconfig.defconfig
+++ b/boards/espressif/esp32s3_devkitm/Kconfig.defconfig
@@ -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
 
diff --git a/boards/espressif/esp_wrover_kit/Kconfig.defconfig b/boards/espressif/esp_wrover_kit/Kconfig.defconfig
index a05a1684d6b..8fd73caab2c 100644
--- a/boards/espressif/esp_wrover_kit/Kconfig.defconfig
+++ b/boards/espressif/esp_wrover_kit/Kconfig.defconfig
@@ -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
diff --git a/boards/ezurio/bl5340_dvk/Kconfig.defconfig b/boards/ezurio/bl5340_dvk/Kconfig.defconfig
index 65c005ee286..ece5d8d8d39 100644
--- a/boards/ezurio/bl5340_dvk/Kconfig.defconfig
+++ b/boards/ezurio/bl5340_dvk/Kconfig.defconfig
@@ -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
diff --git a/boards/hardkernel/odroid_go/Kconfig.defconfig b/boards/hardkernel/odroid_go/Kconfig.defconfig
index 8b9cb59d3f3..2e7207855a8 100644
--- a/boards/hardkernel/odroid_go/Kconfig.defconfig
+++ b/boards/hardkernel/odroid_go/Kconfig.defconfig
@@ -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
 
diff --git a/boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig b/boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig
index 4f459aa0ca4..eafe4773552 100644
--- a/boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig
+++ b/boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig
@@ -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
 
diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig
index 82915e44b94..d92fca42fa3 100644
--- a/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig
+++ b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig
@@ -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
 
diff --git a/boards/infineon/cy8cproto_062_4343w/Kconfig.defconfig b/boards/infineon/cy8cproto_062_4343w/Kconfig.defconfig
index 270370c7660..5573b7f0417 100644
--- a/boards/infineon/cy8cproto_062_4343w/Kconfig.defconfig
+++ b/boards/infineon/cy8cproto_062_4343w/Kconfig.defconfig
@@ -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
diff --git a/boards/infineon/cy8cproto_063_ble/Kconfig.defconfig b/boards/infineon/cy8cproto_063_ble/Kconfig.defconfig
index 2d079f63a6b..a93950668b8 100644
--- a/boards/infineon/cy8cproto_063_ble/Kconfig.defconfig
+++ b/boards/infineon/cy8cproto_063_ble/Kconfig.defconfig
@@ -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
diff --git a/boards/kincony/kincony_kc868_a32/Kconfig.defconfig b/boards/kincony/kincony_kc868_a32/Kconfig.defconfig
index e8705a11f98..43a91bfec28 100644
--- a/boards/kincony/kincony_kc868_a32/Kconfig.defconfig
+++ b/boards/kincony/kincony_kc868_a32/Kconfig.defconfig
@@ -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
 
diff --git a/boards/luatos/esp32c3_luatos_core/Kconfig.defconfig b/boards/luatos/esp32c3_luatos_core/Kconfig.defconfig
index 054ac256729..6454816e243 100644
--- a/boards/luatos/esp32c3_luatos_core/Kconfig.defconfig
+++ b/boards/luatos/esp32c3_luatos_core/Kconfig.defconfig
@@ -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
diff --git a/boards/luatos/esp32s3_luatos_core/Kconfig.defconfig b/boards/luatos/esp32s3_luatos_core/Kconfig.defconfig
index 093805f235b..f14d264fb08 100644
--- a/boards/luatos/esp32s3_luatos_core/Kconfig.defconfig
+++ b/boards/luatos/esp32s3_luatos_core/Kconfig.defconfig
@@ -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
 
diff --git a/boards/m5stack/m5stack_atom_lite/Kconfig.defconfig b/boards/m5stack/m5stack_atom_lite/Kconfig.defconfig
index d56d34b22d7..56e38c448a4 100644
--- a/boards/m5stack/m5stack_atom_lite/Kconfig.defconfig
+++ b/boards/m5stack/m5stack_atom_lite/Kconfig.defconfig
@@ -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
 
diff --git a/boards/m5stack/m5stack_atoms3/Kconfig.defconfig b/boards/m5stack/m5stack_atoms3/Kconfig.defconfig
index c0dadaceeb4..96da63c4d67 100644
--- a/boards/m5stack/m5stack_atoms3/Kconfig.defconfig
+++ b/boards/m5stack/m5stack_atoms3/Kconfig.defconfig
@@ -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
 
diff --git a/boards/m5stack/m5stack_atoms3_lite/Kconfig.defconfig b/boards/m5stack/m5stack_atoms3_lite/Kconfig.defconfig
index 8039b4762cd..918a3ae2692 100644
--- a/boards/m5stack/m5stack_atoms3_lite/Kconfig.defconfig
+++ b/boards/m5stack/m5stack_atoms3_lite/Kconfig.defconfig
@@ -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
 
diff --git a/boards/m5stack/m5stack_core2/Kconfig.defconfig b/boards/m5stack/m5stack_core2/Kconfig.defconfig
index 2c0a21ef88d..e3aba605716 100644
--- a/boards/m5stack/m5stack_core2/Kconfig.defconfig
+++ b/boards/m5stack/m5stack_core2/Kconfig.defconfig
@@ -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
diff --git a/boards/m5stack/m5stack_stamps3/Kconfig.defconfig b/boards/m5stack/m5stack_stamps3/Kconfig.defconfig
index 70493b8d475..f2254332b4b 100644
--- a/boards/m5stack/m5stack_stamps3/Kconfig.defconfig
+++ b/boards/m5stack/m5stack_stamps3/Kconfig.defconfig
@@ -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
 
diff --git a/boards/m5stack/m5stickc_plus/Kconfig.defconfig b/boards/m5stack/m5stickc_plus/Kconfig.defconfig
index aea1b614a01..f9490d98a57 100644
--- a/boards/m5stack/m5stickc_plus/Kconfig.defconfig
+++ b/boards/m5stack/m5stickc_plus/Kconfig.defconfig
@@ -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
diff --git a/boards/m5stack/stamp_c3/Kconfig.defconfig b/boards/m5stack/stamp_c3/Kconfig.defconfig
index 4ce7fe02e12..949f876f7bc 100644
--- a/boards/m5stack/stamp_c3/Kconfig.defconfig
+++ b/boards/m5stack/stamp_c3/Kconfig.defconfig
@@ -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
diff --git a/boards/native/native_posix/Kconfig.defconfig b/boards/native/native_posix/Kconfig.defconfig
index 6db6f0aee1b..b34a73d36ae 100644
--- a/boards/native/native_posix/Kconfig.defconfig
+++ b/boards/native/native_posix/Kconfig.defconfig
@@ -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
 
diff --git a/boards/native/native_sim/Kconfig.defconfig b/boards/native/native_sim/Kconfig.defconfig
index 02d6b1d6465..d24e71528ba 100644
--- a/boards/native/native_sim/Kconfig.defconfig
+++ b/boards/native/native_sim/Kconfig.defconfig
@@ -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
 
diff --git a/boards/native/nrf_bsim/Kconfig.defconfig b/boards/native/nrf_bsim/Kconfig.defconfig
index c3c786e45db..2ff17802977 100644
--- a/boards/native/nrf_bsim/Kconfig.defconfig
+++ b/boards/native/nrf_bsim/Kconfig.defconfig
@@ -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
 
diff --git a/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig b/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig
index c8d07e2adfa..62316a2aeb0 100644
--- a/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig
+++ b/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig
@@ -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
diff --git a/boards/nordic/nrf5340dk/Kconfig.defconfig b/boards/nordic/nrf5340dk/Kconfig.defconfig
index 67d7c7db9d5..972d8433c90 100644
--- a/boards/nordic/nrf5340dk/Kconfig.defconfig
+++ b/boards/nordic/nrf5340dk/Kconfig.defconfig
@@ -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
diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig
index 74fe93905ac..e37975f96ad 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54h20dk/Kconfig.defconfig
@@ -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
 
diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index 701bd9be4e6..92eac11503d 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -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
diff --git a/boards/olimex/olimex_esp32_evb/Kconfig.defconfig b/boards/olimex/olimex_esp32_evb/Kconfig.defconfig
index c15264f5538..cc6993e52e6 100644
--- a/boards/olimex/olimex_esp32_evb/Kconfig.defconfig
+++ b/boards/olimex/olimex_esp32_evb/Kconfig.defconfig
@@ -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
 
diff --git a/boards/others/icev_wireless/Kconfig.defconfig b/boards/others/icev_wireless/Kconfig.defconfig
index 96ed16249d4..2aa7b0a4f48 100644
--- a/boards/others/icev_wireless/Kconfig.defconfig
+++ b/boards/others/icev_wireless/Kconfig.defconfig
@@ -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
diff --git a/boards/panasonic/pan1783/Kconfig.defconfig b/boards/panasonic/pan1783/Kconfig.defconfig
index ec08e860bbd..6c70d441e91 100644
--- a/boards/panasonic/pan1783/Kconfig.defconfig
+++ b/boards/panasonic/pan1783/Kconfig.defconfig
@@ -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
diff --git a/boards/raytac/mdbt53_db_40/Kconfig.defconfig b/boards/raytac/mdbt53_db_40/Kconfig.defconfig
index 7bb0e9da948..bb53d3ae8f4 100644
--- a/boards/raytac/mdbt53_db_40/Kconfig.defconfig
+++ b/boards/raytac/mdbt53_db_40/Kconfig.defconfig
@@ -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
diff --git a/boards/raytac/mdbt53v_db_40/Kconfig.defconfig b/boards/raytac/mdbt53v_db_40/Kconfig.defconfig
index 9cdb1683eed..9573720773d 100644
--- a/boards/raytac/mdbt53v_db_40/Kconfig.defconfig
+++ b/boards/raytac/mdbt53v_db_40/Kconfig.defconfig
@@ -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
diff --git a/boards/renesas/da1469x_dk_pro/Kconfig.defconfig b/boards/renesas/da1469x_dk_pro/Kconfig.defconfig
index d491f8c1ebd..b0e0f1ff8ee 100644
--- a/boards/renesas/da1469x_dk_pro/Kconfig.defconfig
+++ b/boards/renesas/da1469x_dk_pro/Kconfig.defconfig
@@ -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
diff --git a/boards/seeed/xiao_esp32c3/Kconfig.defconfig b/boards/seeed/xiao_esp32c3/Kconfig.defconfig
index f70e724ed8e..d641d8be3a9 100644
--- a/boards/seeed/xiao_esp32c3/Kconfig.defconfig
+++ b/boards/seeed/xiao_esp32c3/Kconfig.defconfig
@@ -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
diff --git a/boards/seeed/xiao_esp32s3/Kconfig.defconfig b/boards/seeed/xiao_esp32s3/Kconfig.defconfig
index 424820d78ad..a1b83409902 100644
--- a/boards/seeed/xiao_esp32s3/Kconfig.defconfig
+++ b/boards/seeed/xiao_esp32s3/Kconfig.defconfig
@@ -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
 
diff --git a/boards/shields/x_nucleo_bnrg2a1/Kconfig.defconfig b/boards/shields/x_nucleo_bnrg2a1/Kconfig.defconfig
index 88f16f95dc5..94ace9e3849 100644
--- a/boards/shields/x_nucleo_bnrg2a1/Kconfig.defconfig
+++ b/boards/shields/x_nucleo_bnrg2a1/Kconfig.defconfig
@@ -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
diff --git a/boards/shields/x_nucleo_idb05a1/Kconfig.defconfig b/boards/shields/x_nucleo_idb05a1/Kconfig.defconfig
index a5fe2515b50..276ee664679 100644
--- a/boards/shields/x_nucleo_idb05a1/Kconfig.defconfig
+++ b/boards/shields/x_nucleo_idb05a1/Kconfig.defconfig
@@ -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
diff --git a/boards/silabs/efr32_radio/Kconfig.defconfig b/boards/silabs/efr32_radio/Kconfig.defconfig
index ce20c2ef360..90a2ab3dd02 100644
--- a/boards/silabs/efr32_radio/Kconfig.defconfig
+++ b/boards/silabs/efr32_radio/Kconfig.defconfig
@@ -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
 
diff --git a/boards/silabs/efr32_thunderboard/Kconfig.defconfig b/boards/silabs/efr32_thunderboard/Kconfig.defconfig
index 9c116263518..e1c23189e31 100644
--- a/boards/silabs/efr32_thunderboard/Kconfig.defconfig
+++ b/boards/silabs/efr32_thunderboard/Kconfig.defconfig
@@ -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
 
diff --git a/boards/silabs/efr32xg24_dk2601b/Kconfig.defconfig b/boards/silabs/efr32xg24_dk2601b/Kconfig.defconfig
index dbd2884e28a..52d6391c03e 100644
--- a/boards/silabs/efr32xg24_dk2601b/Kconfig.defconfig
+++ b/boards/silabs/efr32xg24_dk2601b/Kconfig.defconfig
@@ -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
 
diff --git a/boards/st/b_l4s5i_iot01a/Kconfig.defconfig b/boards/st/b_l4s5i_iot01a/Kconfig.defconfig
index 0000fc670f3..317d096e0ce 100644
--- a/boards/st/b_l4s5i_iot01a/Kconfig.defconfig
+++ b/boards/st/b_l4s5i_iot01a/Kconfig.defconfig
@@ -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
diff --git a/boards/st/disco_l475_iot1/Kconfig.defconfig b/boards/st/disco_l475_iot1/Kconfig.defconfig
index b99f7c57511..808425eae05 100644
--- a/boards/st/disco_l475_iot1/Kconfig.defconfig
+++ b/boards/st/disco_l475_iot1/Kconfig.defconfig
@@ -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
diff --git a/boards/st/nucleo_wb55rg/Kconfig.defconfig b/boards/st/nucleo_wb55rg/Kconfig.defconfig
index a4822901739..cd63e8d080e 100644
--- a/boards/st/nucleo_wb55rg/Kconfig.defconfig
+++ b/boards/st/nucleo_wb55rg/Kconfig.defconfig
@@ -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
diff --git a/boards/st/sensortile_box/Kconfig.defconfig b/boards/st/sensortile_box/Kconfig.defconfig
index 8e3f0bb1670..faa5dc0864c 100644
--- a/boards/st/sensortile_box/Kconfig.defconfig
+++ b/boards/st/sensortile_box/Kconfig.defconfig
@@ -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
diff --git a/boards/st/sensortile_box_pro/Kconfig.defconfig b/boards/st/sensortile_box_pro/Kconfig.defconfig
index f0271728a9a..caa346b0075 100644
--- a/boards/st/sensortile_box_pro/Kconfig.defconfig
+++ b/boards/st/sensortile_box_pro/Kconfig.defconfig
@@ -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
diff --git a/boards/st/steval_stwinbx1/Kconfig.defconfig b/boards/st/steval_stwinbx1/Kconfig.defconfig
index f10fea5e293..594ebede5a7 100644
--- a/boards/st/steval_stwinbx1/Kconfig.defconfig
+++ b/boards/st/steval_stwinbx1/Kconfig.defconfig
@@ -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
diff --git a/boards/st/stm32l562e_dk/Kconfig.defconfig b/boards/st/stm32l562e_dk/Kconfig.defconfig
index 5dea5bc3a74..ed9a04edc17 100644
--- a/boards/st/stm32l562e_dk/Kconfig.defconfig
+++ b/boards/st/stm32l562e_dk/Kconfig.defconfig
@@ -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
diff --git a/boards/st/stm32wb5mm_dk/Kconfig.defconfig b/boards/st/stm32wb5mm_dk/Kconfig.defconfig
index 37be19b4d1c..b75d5bdb31d 100644
--- a/boards/st/stm32wb5mm_dk/Kconfig.defconfig
+++ b/boards/st/stm32wb5mm_dk/Kconfig.defconfig
@@ -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
diff --git a/boards/st/stm32wb5mmg/Kconfig.defconfig b/boards/st/stm32wb5mmg/Kconfig.defconfig
index e63531f897b..e07cc7210b2 100644
--- a/boards/st/stm32wb5mmg/Kconfig.defconfig
+++ b/boards/st/stm32wb5mmg/Kconfig.defconfig
@@ -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
diff --git a/boards/vcc-gnd/yd_esp32/Kconfig.defconfig b/boards/vcc-gnd/yd_esp32/Kconfig.defconfig
index 9b7b408dbef..de2f5af5e75 100644
--- a/boards/vcc-gnd/yd_esp32/Kconfig.defconfig
+++ b/boards/vcc-gnd/yd_esp32/Kconfig.defconfig
@@ -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
 
diff --git a/boards/waveshare/esp32s3_touch_lcd_1_28/Kconfig.defconfig b/boards/waveshare/esp32s3_touch_lcd_1_28/Kconfig.defconfig
index 33296a8e529..c0de8c41f7a 100644
--- a/boards/waveshare/esp32s3_touch_lcd_1_28/Kconfig.defconfig
+++ b/boards/waveshare/esp32s3_touch_lcd_1_28/Kconfig.defconfig
@@ -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
 
diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig
index 7f346813a97..ebbaf2dbe22 100644
--- a/drivers/bluetooth/hci/Kconfig
+++ b/drivers/bluetooth/hci/Kconfig
@@ -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
diff --git a/soc/nxp/rw/Kconfig.defconfig b/soc/nxp/rw/Kconfig.defconfig
index d00e99ed261..5a664c5c4f9 100644
--- a/soc/nxp/rw/Kconfig.defconfig
+++ b/soc/nxp/rw/Kconfig.defconfig
@@ -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"
diff --git a/soc/st/stm32/stm32wbax/Kconfig.defconfig b/soc/st/stm32/stm32wbax/Kconfig.defconfig
index 6e47a7ba7f3..c2f53fd3641 100644
--- a/soc/st/stm32/stm32wbax/Kconfig.defconfig
+++ b/soc/st/stm32/stm32wbax/Kconfig.defconfig
@@ -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
diff --git a/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.defconfig b/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.defconfig
index 38c6d4b3019..874e5591893 100644
--- a/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.defconfig
+++ b/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.defconfig
@@ -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