Bluetooth: Kconfig: Restructure for a more logical hierarchy

Restructure the Bluetooth options more logically.

- Both host and controller are now behind the same high level
  CONFIG_BLUETOOTH.

- Selecting controller support disables other HCI driver selection, so
  the controller isn't in the same list as HCI drivers any more.

- Under the top-level there's a "Custom stack" option, which when
  enabled opens up the option of choosing CONFIG_NBLE.

There are various other cleanups and simplifications in this patch as
well, since splitting these up would have been fairly tricky while
making sure all test cases still build.

Change-Id: I5bb715cb9d20201cb8b72fbd149c8a09a4b2d7d2
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

71 files changed, 95 insertions, 148 deletions

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index ea082456f..5375396b3 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -24,9 +24,13 @@ if BLUETOOTH
 
 menu "Bluetooth Drivers"
 
+if BLUETOOTH_HCI
 source "drivers/bluetooth/hci/Kconfig"
+endif
 
+if BLUETOOTH_CUSTOM
 source "drivers/bluetooth/nble/Kconfig"
+endif
 
 config BLUETOOTH_NRF51_PM
 	bool "nRF51 Power Management [EXPERIMENTAL]"
@@ -37,7 +41,7 @@ config BLUETOOTH_NRF51_PM
 
 config BLUETOOTH_WAIT_NOP
 	bool "Wait for \"NOP\" Command Complete event during init"
-	depends on BLUETOOTH_STACK_HCI || BLUETOOTH_STACK_HCI_RAW
+	depends on BLUETOOTH_HCI
 	help
 	  Some controllers emit a Command Complete event for the NOP
 	  opcode to indicate that they're ready to receive commands.
diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig
index acf296a6b..e54555f7b 100644
--- a/drivers/bluetooth/hci/Kconfig
+++ b/drivers/bluetooth/hci/Kconfig
@@ -16,10 +16,12 @@
 # limitations under the License.
 #
 
-if BLUETOOTH_STACK_HCI || BLUETOOTH_STACK_HCI_RAW
-
 comment "Bluetooth HCI Driver Options"
 
+# Controller support is an HCI driver in itself, so these HCI driver
+# options are only applicable if controller support hasn't been enabled.
+if !BLUETOOTH_CONTROLLER
+
 config BLUETOOTH_UART
 	bool
 	default n
@@ -48,12 +50,6 @@ config BLUETOOTH_H5
 	  Bluetooth three-wire (H:5) UART driver. Implementation of HCI
 	  Three-Wire UART Transport Layer.
 
-config BLUETOOTH_CONTROLLER
-	bool "Controller"
-	select BLUETOOTH_HOST_BUFFERS
-	help
-	  Enables support for SoC native controller implementation.
-
 config BLUETOOTH_NO_DRIVER
 	bool "No default HCI driver"
 	help
@@ -62,6 +58,8 @@ config BLUETOOTH_NO_DRIVER
 
 endchoice
 
+endif # !BLUETOOTH_CONTROLLER
+
 config BLUETOOTH_HOST_BUFFERS
 	bool "Host managed incoming data buffers"
 	default n
@@ -76,7 +74,7 @@ config BLUETOOTH_HOST_BUFFERS
 
 config BLUETOOTH_DEBUG_HCI_DRIVER
 	bool "Bluetooth HCI driver debug"
-	depends on BLUETOOTH_DEBUG && (BLUETOOTH_UART || BLUETOOTH_CONTROLLER)
+	depends on BLUETOOTH_DEBUG
 	default n
 	help
 	  This option enables debug support for the chosen
@@ -110,5 +108,3 @@ config BLUETOOTH_HCI_RECV_RESERVE
 	default 0
 	default 0 if BLUETOOTH_H4
 	default 0 if BLUETOOTH_H5
-
-endif # BLUETOOTH_STACK_HCI || BLUETOOTH_STACK_HCI_RAW
diff --git a/drivers/bluetooth/nble/Kconfig b/drivers/bluetooth/nble/Kconfig
index 5ff691b3a..8030f5e6c 100644
--- a/drivers/bluetooth/nble/Kconfig
+++ b/drivers/bluetooth/nble/Kconfig
@@ -17,18 +17,11 @@
 #
 
 config NBLE
-	bool "Support for custom Nordic Semiconductor BLE protocol"
-	default y if BLUETOOTH_STACK_NBLE
-	default n
-	select BLUETOOTH_PERIPHERAL
-	select BLUETOOTH_CENTRAL
-	select BLUETOOTH_GATT_CLIENT
-	select BLUETOOTH_SMP
+	bool "Support for custom non-HCI nRF51 firmware"
 	select UART_INTERRUPT_DRIVEN
 	select NANO_TIMEOUTS
 	select NET_BUF
 	depends on SERIAL
-	depends on BLUETOOTH_STACK_NBLE
 	help
 	  Enables support for using Nordic Semiconductor nRF51 Bluetooth
 	  LE chips with a custom firmware. The API for this is a subset of
@@ -43,11 +36,11 @@ config NBLE
 if NBLE
 config BLUETOOTH_PERIPHERAL
 	bool
-	default n
+	default y
 
 config BLUETOOTH_CENTRAL
 	bool
-	default n
+	default y
 
 config BLUETOOTH_ATT_PREPARE_COUNT
 	int "Number of ATT prepare write buffers"
@@ -59,11 +52,11 @@ config BLUETOOTH_ATT_PREPARE_COUNT
 
 config BLUETOOTH_GATT_CLIENT
 	bool
-	default n
+	default y
 
 config BLUETOOTH_SMP
 	bool
-	default n
+	default y
 
 config	BLUETOOTH_MAX_CONN
 	int
diff --git a/samples/bluetooth/beacon/prj.conf b/samples/bluetooth/beacon/prj.conf
index 289635c92..86d640fbc 100644
--- a/samples/bluetooth/beacon/prj.conf
+++ b/samples/bluetooth/beacon/prj.conf
@@ -1,3 +1,2 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
diff --git a/samples/bluetooth/beacon/prj_nble.conf b/samples/bluetooth/beacon/prj_nble.conf
index 787767308..fa1c977c6 100644
--- a/samples/bluetooth/beacon/prj_nble.conf
+++ b/samples/bluetooth/beacon/prj_nble.conf
@@ -1,4 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
diff --git a/samples/bluetooth/central/prj.conf b/samples/bluetooth/central/prj.conf
index b7adcd175..174407a45 100644
--- a/samples/bluetooth/central/prj.conf
+++ b/samples/bluetooth/central/prj.conf
@@ -1,3 +1,2 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_CENTRAL=y
diff --git a/samples/bluetooth/central_hr/prj.conf b/samples/bluetooth/central_hr/prj.conf
index d4aa8314f..49272b15b 100644
--- a/samples/bluetooth/central_hr/prj.conf
+++ b/samples/bluetooth/central_hr/prj.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/samples/bluetooth/eddystone/prj.conf b/samples/bluetooth/eddystone/prj.conf
index d33189405..4b7e9da2d 100644
--- a/samples/bluetooth/eddystone/prj.conf
+++ b/samples/bluetooth/eddystone/prj.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_GATT_DYNAMIC_DB=y
diff --git a/samples/bluetooth/eddystone/prj_nble.conf b/samples/bluetooth/eddystone/prj_nble.conf
index 787767308..fa1c977c6 100644
--- a/samples/bluetooth/eddystone/prj_nble.conf
+++ b/samples/bluetooth/eddystone/prj_nble.conf
@@ -1,4 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
diff --git a/samples/bluetooth/hci_uart/generic.conf b/samples/bluetooth/hci_uart/generic.conf
index b66a93e38..e0be57999 100644
--- a/samples/bluetooth/hci_uart/generic.conf
+++ b/samples/bluetooth/hci_uart/generic.conf
@@ -4,4 +4,4 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_HCI_RAW=y
+CONFIG_BLUETOOTH_HCI_RAW=y
diff --git a/samples/bluetooth/hci_uart/nrf5.conf b/samples/bluetooth/hci_uart/nrf5.conf
index c51441adc..e3e5fdb44 100644
--- a/samples/bluetooth/hci_uart/nrf5.conf
+++ b/samples/bluetooth/hci_uart/nrf5.conf
@@ -5,7 +5,7 @@ CONFIG_GPIO=y
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_HCI_RAW=y
+CONFIG_BLUETOOTH_HCI_RAW=y
 CONFIG_BLUETOOTH_MAX_CONN=16
 CONFIG_BLUETOOTH_CONTROLLER_RX_BUFFERS=4
 CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFERS=4
diff --git a/samples/bluetooth/hci_usb/prj.conf b/samples/bluetooth/hci_usb/prj.conf
index 4fb357ba9..6245cb5e3 100644
--- a/samples/bluetooth/hci_usb/prj.conf
+++ b/samples/bluetooth/hci_usb/prj.conf
@@ -6,4 +6,4 @@ CONFIG_USB_DEVICE_STACK=y
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_HCI_RAW=y
+CONFIG_BLUETOOTH_HCI_RAW=y
diff --git a/samples/bluetooth/peripheral/prj.conf b/samples/bluetooth/peripheral/prj.conf
index cf93806d9..cf2033f46 100644
--- a/samples/bluetooth/peripheral/prj.conf
+++ b/samples/bluetooth/peripheral/prj.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_SMP=y
 CONFIG_BLUETOOTH_SIGNING=y
diff --git a/samples/bluetooth/peripheral/prj_nble.conf b/samples/bluetooth/peripheral/prj_nble.conf
index 62486eb84..08982e791 100644
--- a/samples/bluetooth/peripheral/prj_nble.conf
+++ b/samples/bluetooth/peripheral/prj_nble.conf
@@ -1,5 +1,5 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_ATT_PREPARE_COUNT=2
diff --git a/samples/bluetooth/peripheral_csc/prj_nble.conf b/samples/bluetooth/peripheral_csc/prj_nble.conf
index 9eb7cd484..9fff2541d 100644
--- a/samples/bluetooth/peripheral_csc/prj_nble.conf
+++ b/samples/bluetooth/peripheral_csc/prj_nble.conf
@@ -1,6 +1,6 @@
 CONFIG_MINIMAL_LIBC_EXTENDED=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
 CONFIG_BLUETOOTH_DEBUG_STDOUT=y
diff --git a/samples/bluetooth/peripheral_dis/prj.conf b/samples/bluetooth/peripheral_dis/prj.conf
index ae1632c77..a5e5b3bf5 100644
--- a/samples/bluetooth/peripheral_dis/prj.conf
+++ b/samples/bluetooth/peripheral_dis/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_GATT_DYNAMIC_DB=y
diff --git a/samples/bluetooth/peripheral_esp/prj.conf b/samples/bluetooth/peripheral_esp/prj.conf
index 6dd0bcd13..ef8a7ca23 100644
--- a/samples/bluetooth/peripheral_esp/prj.conf
+++ b/samples/bluetooth/peripheral_esp/prj.conf
@@ -1,6 +1,5 @@
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_GATT_DYNAMIC_DB=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/samples/bluetooth/peripheral_esp/prj_nble.conf b/samples/bluetooth/peripheral_esp/prj_nble.conf
index 787767308..fa1c977c6 100644
--- a/samples/bluetooth/peripheral_esp/prj_nble.conf
+++ b/samples/bluetooth/peripheral_esp/prj_nble.conf
@@ -1,4 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
diff --git a/samples/bluetooth/peripheral_hids/prj.conf b/samples/bluetooth/peripheral_hids/prj.conf
index a9de3174c..a0075b071 100644
--- a/samples/bluetooth/peripheral_hids/prj.conf
+++ b/samples/bluetooth/peripheral_hids/prj.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_SMP=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
diff --git a/samples/bluetooth/peripheral_hids/prj_nble.conf b/samples/bluetooth/peripheral_hids/prj_nble.conf
index 787767308..fa1c977c6 100644
--- a/samples/bluetooth/peripheral_hids/prj_nble.conf
+++ b/samples/bluetooth/peripheral_hids/prj_nble.conf
@@ -1,4 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
diff --git a/samples/bluetooth/peripheral_hr/prj.conf b/samples/bluetooth/peripheral_hr/prj.conf
index a9de3174c..a0075b071 100644
--- a/samples/bluetooth/peripheral_hr/prj.conf
+++ b/samples/bluetooth/peripheral_hr/prj.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_SMP=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
diff --git a/samples/bluetooth/peripheral_hr/prj_nble.conf b/samples/bluetooth/peripheral_hr/prj_nble.conf
index 787767308..fa1c977c6 100644
--- a/samples/bluetooth/peripheral_hr/prj_nble.conf
+++ b/samples/bluetooth/peripheral_hr/prj_nble.conf
@@ -1,4 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
diff --git a/samples/bluetooth/peripheral_sc_only/prj.conf b/samples/bluetooth/peripheral_sc_only/prj.conf
index 9bbe3f8f6..8e866b56e 100644
--- a/samples/bluetooth/peripheral_sc_only/prj.conf
+++ b/samples/bluetooth/peripheral_sc_only/prj.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_SMP=y
 CONFIG_BLUETOOTH_SMP_SC_ONLY=y
diff --git a/samples/environmental_sensing/x86/prj_nble.conf b/samples/environmental_sensing/x86/prj_nble.conf
index 996dc5e16..86585ddc5 100644
--- a/samples/environmental_sensing/x86/prj_nble.conf
+++ b/samples/environmental_sensing/x86/prj_nble.conf
@@ -7,5 +7,5 @@ CONFIG_IPM_CONSOLE_SENDER=y
 CONFIG_NANO_TIMEOUTS=y
 CONFIG_TIMESLICE_SIZE=1
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
diff --git a/samples/environmental_sensing/x86/prj_nimble.conf b/samples/environmental_sensing/x86/prj_nimble.conf
index e71a9d740..70c5534f0 100644
--- a/samples/environmental_sensing/x86/prj_nimble.conf
+++ b/samples/environmental_sensing/x86/prj_nimble.conf
@@ -7,7 +7,6 @@ CONFIG_IPM_CONSOLE_SENDER=y
 CONFIG_NANO_TIMEOUTS=y
 CONFIG_TIMESLICE_SIZE=1
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_GATT_DYNAMIC_DB=y
 CONFIG_GPIO=y
diff --git a/samples/net/echo_client/prj_bt.conf b/samples/net/echo_client/prj_bt.conf
index 25f5b0137..279e77a8b 100644
--- a/samples/net/echo_client/prj_bt.conf
+++ b/samples/net/echo_client/prj_bt.conf
@@ -1,6 +1,5 @@
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_SMP=y
 CONFIG_BLUETOOTH_SIGNING=y
diff --git a/samples/net/echo_server/prj_bt.conf b/samples/net/echo_server/prj_bt.conf
index 253d93aef..354033833 100644
--- a/samples/net/echo_server/prj_bt.conf
+++ b/samples/net/echo_server/prj_bt.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_DEBUG_L2CAP=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/samples/net/trickle-legacy/prj_bt.conf b/samples/net/trickle-legacy/prj_bt.conf
index 290ad1d76..0a388e635 100644
--- a/samples/net/trickle-legacy/prj_bt.conf
+++ b/samples/net/trickle-legacy/prj_bt.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_DEBUG_L2CAP=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index 975a1d5f2..533c9552a 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -15,6 +15,49 @@
 # limitations under the License.
 #
 
+menuconfig BLUETOOTH
+	bool "Bluetooth support"
+	default n
+	select NANO_TIMEOUTS
+	select NET_BUF
+	help
+	  This option enables Bluetooth support.
+
+if BLUETOOTH
+
+choice
+	prompt "Bluetooth Stack Selection"
+	default BLUETOOTH_HCI
+	help
+	  Select the Bluetooth stack to compile.
+
+config BLUETOOTH_HCI
+	bool "HCI-based"
+	help
+	  HCI-based stack with optional host & controller parts and an
+	  HCI driver in between.
+
+config BLUETOOTH_CUSTOM
+	bool "Custom"
+	help
+	  Select a custom, non-HCI based stack. If you're not sure what
+	  this is, you probably want the HCI-based stack instead.
+
+endchoice
+
+if BLUETOOTH_HCI
+
+config BLUETOOTH_CONTROLLER
+	bool "Bluetooth Controller"
+	select BLUETOOTH_HOST_BUFFERS
+	help
+	  Enables support for SoC native controller implementation.
+
 source "subsys/bluetooth/host/Kconfig"
 
+if BLUETOOTH_CONTROLLER
 source "subsys/bluetooth/controller/Kconfig"
+endif
+
+endif # BLUETOOTH_HCI
+endif # BLUETOOTH
diff --git a/subsys/bluetooth/Makefile b/subsys/bluetooth/Makefile
index 30cad48da..b3b3182f2 100644
--- a/subsys/bluetooth/Makefile
+++ b/subsys/bluetooth/Makefile
@@ -1,2 +1,2 @@
-obj-$(CONFIG_BLUETOOTH) += host/
+obj-$(CONFIG_BLUETOOTH_HCI) += host/
 obj-$(CONFIG_BLUETOOTH_CONTROLLER) += controller/
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index cc3d6cffb..3ed7b41ef 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -38,7 +38,7 @@ config BLUETOOTH_CONTROLLER_RX_STACK_SIZE
 
 config BLUETOOTH_CONTROLLER_ASSERT_HANDLER
 	bool "Bluetooth Controller Assertion Handler"
-	depends on BLUETOOTH_STACK_HCI_RAW
+	depends on BLUETOOTH_HCI_RAW
 	help
 	  This option enables an application-defined sink for the
 	  controller assertion mechanism. This must be defined in
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 4bf342d50..4ff3951e1 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -16,59 +16,24 @@
 # limitations under the License.
 #
 
-menuconfig BLUETOOTH
-	bool "Bluetooth support"
-	default n
-	select NANO_TIMEOUTS
-	select NET_BUF
-	help
-	  This option enables Bluetooth support.
-
-if BLUETOOTH
-
-choice
-	prompt "Bluetooth Stack Selection"
-	default BLUETOOTH_STACK_HCI
-	help
-	  Select the Bluetooth stack to compile.
-
-config BLUETOOTH_STACK_HCI
-	bool "HCI Stack"
-	help
-	  Select the Bluetooth stack to use with HCI drivers.
+comment "Host Stack Configuration"
 
-config BLUETOOTH_STACK_NBLE
-	bool "Nordic BLE Stack"
-	help
-	  Select the Bluetooth stack to use with Nordic BLE drivers.
-
-config BLUETOOTH_STACK_HCI_RAW
-	bool "Bluetooth RAW HCI access to the controller"
+config BLUETOOTH_HCI_RAW
+	bool "RAW HCI access"
 	help
 	  This option allows to access Bluetooth controller
 	  from the application with the RAW HCI protocol.
 
-endchoice
-
-comment "HCI Stack Configurations"
-	depends on BLUETOOTH_STACK_HCI
-
-config BLUETOOTH_LE
-	bool "Bluetooth Low Energy (LE) support"
+# Virtual/hidden option to make the conditions more intuitive
+config BLUETOOTH_HCI_HOST
+	bool
 	default y
+	depends on !BLUETOOTH_HCI_RAW
 	select TINYCRYPT
-	select TINYCRYPT_AES if BLUETOOTH_SMP
-	select TINYCRYPT_AES_CMAC if BLUETOOTH_SMP
 	select TINYCRYPT_SHA256
 	select TINYCRYPT_SHA256_HMAC
 	select TINYCRYPT_SHA256_HMAC_PRNG
-	depends on BLUETOOTH_STACK_HCI
-	help
-	  This option enables Bluetooth Low Energy (LE) support.
-	  Currently it is mandatory whenever Bluetooth support
-	  (CONFIG_BLUETOOTH) is enabled.
 
-if BLUETOOTH_LE || BLUETOOTH_STACK_HCI_RAW
 config BLUETOOTH_HCI_CMD_COUNT
 	int "Number of HCI command buffers"
 	default 2
@@ -106,18 +71,17 @@ config BLUETOOTH_MAX_EVT_LEN
 	  for LE is the Command Complete for Read Local Supported
 	  Commands. It is a 3 byte Command Complete header + 65 byte
 	  return parameters = 68 bytes in total.
-endif # BLUETOOTH_LE || BLUETOOTH_STACK_HCI_RAW
 
 config BLUETOOTH_UART_TO_HOST_DEV_NAME
 	string "Device Name of UART Device to an external Bluetooth Host"
 	default "UART_0"
-	depends on BLUETOOTH_STACK_HCI_RAW
+	depends on BLUETOOTH_HCI_RAW
 	help
 	  This option specifies the name of UART device to be used
 	  to connect to an external Bluetooth Host when Zephyr is
 	  acting as a Bluetooth Controller.
 
-if (BLUETOOTH_LE && BLUETOOTH_CONN) || BLUETOOTH_STACK_HCI_RAW
+if BLUETOOTH_CONN || BLUETOOTH_HCI_RAW
 config BLUETOOTH_ACL_IN_COUNT
 	int "Number of incoming ACL data buffers"
 	default 5
@@ -134,9 +98,9 @@ config BLUETOOTH_L2CAP_IN_MTU
 	range 65 1300 if BLUETOOTH_SMP
 	help
 	  Maximum size of each incoming L2CAP PDU.
-endif # BLUETOOTH_LE && BLUETOOTH_CONN || BLUETOOTH_STACK_HCI_RAW
+endif # BLUETOOTH_CONN || BLUETOOTH_HCI_RAW
 
-if BLUETOOTH_LE
+if BLUETOOTH_HCI_HOST
 config BLUETOOTH_INTERNAL_STORAGE
 	bool "Use an internal persistent storage handler"
 	depends on FILE_SYSTEM
@@ -204,6 +168,8 @@ config BLUETOOTH_ATT_REQ_COUNT
 
 config BLUETOOTH_SMP
 	bool "Security Manager Protocol support"
+	select TINYCRYPT_AES
+	select TINYCRYPT_AES_CMAC
 	default n
 	help
 	  This option enables support for the Security Manager Protocol
@@ -299,7 +265,7 @@ config BLUETOOTH_TINYCRYPT_ECC
 	  controller doesn't support required HCI commands LE Secure
 	  Connections support will be disabled.
 
-endif # BLUETOOTH_LE
+endif # BLUETOOTH_HCI_HOST
 
 config BLUETOOTH_MAX_CONN
 	int "Maximum number of simultaneous connections"
@@ -335,7 +301,6 @@ config BLUETOOTH_DEBUG_LOG
 
 config BLUETOOTH_DEBUG_MONITOR
 	bool "Monitor protocol over UART"
-	depends on BLUETOOTH_STACK_HCI
 	select BLUETOOTH_DEBUG
 	select CONSOLE_HAS_DRIVER
 	help
@@ -371,7 +336,7 @@ config BLUETOOTH_MONITOR_ON_DEV_NAME
 if BLUETOOTH_DEBUG
 config BLUETOOTH_DEBUG_HCI_CORE
 	bool "Bluetooth HCI core debug"
-	depends on BLUETOOTH_STACK_HCI
+	depends on BLUETOOTH_HCI_HOST
 	default n
 	help
 	  This option enables debug support for Bluetooth HCI
@@ -387,7 +352,7 @@ config BLUETOOTH_DEBUG_CONN
 
 config BLUETOOTH_DEBUG_KEYS
 	bool "Bluetooth security keys debug"
-	depends on BLUETOOTH_STACK_HCI
+	depends on BLUETOOTH_HCI_HOST
 	depends on BLUETOOTH_SMP
 	default n
 	help
@@ -404,7 +369,7 @@ config BLUETOOTH_DEBUG_L2CAP
 
 config BLUETOOTH_DEBUG_SMP
 	bool "Bluetooth Security Manager Protocol (SMP) debug"
-	depends on BLUETOOTH_STACK_HCI
+	depends on BLUETOOTH_HCI_HOST
 	depends on BLUETOOTH_SMP
 	default n
 	help
@@ -488,7 +453,7 @@ endif # BLUETOOTH_DEBUG
 config BLUETOOTH_BREDR
 	bool "Bluetooth BR/EDR support [EXPERIMENTAL]"
 	default n
-	depends on BLUETOOTH_STACK_HCI
+	depends on BLUETOOTH_HCI_HOST
 	select BLUETOOTH_CONN
 	select BLUETOOTH_L2CAP_DYNAMIC_CHANNEL
 	help
@@ -544,4 +509,3 @@ config BLUETOOTH_BREDR_NAME
 	  Bluetooth BR/EDR name. Name can be up to 248 bytes long (excluding
 	  NULL termination). Can be empty string.
 endif # BLUETOOTH_BREDR
-endif # BLUETOOTH
diff --git a/subsys/bluetooth/host/Makefile b/subsys/bluetooth/host/Makefile
index 7a6f0cab7..ff87dfc9b 100644
--- a/subsys/bluetooth/host/Makefile
+++ b/subsys/bluetooth/host/Makefile
@@ -1,11 +1,8 @@
 ccflags-y +=-I$(srctree)/include/drivers
 
-obj-$(CONFIG_BLUETOOTH_STACK_HCI) += \
-	uuid.o \
-	hci_core.o
+obj-$(CONFIG_BLUETOOTH_HCI_HOST) += uuid.o hci_core.o
 
-obj-$(CONFIG_BLUETOOTH_STACK_HCI_RAW) += \
-	hci_raw.o
+obj-$(CONFIG_BLUETOOTH_HCI_RAW) += hci_raw.o
 
 obj-$(CONFIG_BLUETOOTH_DEBUG) += log.o
 
diff --git a/tests/bluetooth/init/prj.conf b/tests/bluetooth/init/prj.conf
index 289635c92..86d640fbc 100644
--- a/tests/bluetooth/init/prj.conf
+++ b/tests/bluetooth/init/prj.conf
@@ -1,3 +1,2 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
diff --git a/tests/bluetooth/init/prj_0.conf b/tests/bluetooth/init/prj_0.conf
index 813a57682..0b7b8a119 100644
--- a/tests/bluetooth/init/prj_0.conf
+++ b/tests/bluetooth/init/prj_0.conf
@@ -1,2 +1 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
diff --git a/tests/bluetooth/init/prj_1.conf b/tests/bluetooth/init/prj_1.conf
index 8e286c669..dfc40f561 100644
--- a/tests/bluetooth/init/prj_1.conf
+++ b/tests/bluetooth/init/prj_1.conf
@@ -1,3 +1,2 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
diff --git a/tests/bluetooth/init/prj_10.conf b/tests/bluetooth/init/prj_10.conf
index dc77dd8be..437bb2377 100644
--- a/tests/bluetooth/init/prj_10.conf
+++ b/tests/bluetooth/init/prj_10.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_11.conf b/tests/bluetooth/init/prj_11.conf
index db905e3a7..392fce628 100644
--- a/tests/bluetooth/init/prj_11.conf
+++ b/tests/bluetooth/init/prj_11.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_12.conf b/tests/bluetooth/init/prj_12.conf
index 7facd4946..f4d4ce55d 100644
--- a/tests/bluetooth/init/prj_12.conf
+++ b/tests/bluetooth/init/prj_12.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_SMP=y
 CONFIG_BLUETOOTH_SIGNING=y
diff --git a/tests/bluetooth/init/prj_13.conf b/tests/bluetooth/init/prj_13.conf
index d08bea461..53e00a2e3 100644
--- a/tests/bluetooth/init/prj_13.conf
+++ b/tests/bluetooth/init/prj_13.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
 CONFIG_BLUETOOTH_SIGNING=y
diff --git a/tests/bluetooth/init/prj_14.conf b/tests/bluetooth/init/prj_14.conf
index 103f48f2d..909454243 100644
--- a/tests/bluetooth/init/prj_14.conf
+++ b/tests/bluetooth/init/prj_14.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_15.conf b/tests/bluetooth/init/prj_15.conf
index 542436299..25575e6f4 100644
--- a/tests/bluetooth/init/prj_15.conf
+++ b/tests/bluetooth/init/prj_15.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_16.conf b/tests/bluetooth/init/prj_16.conf
index b9fced34c..9cc645844 100644
--- a/tests/bluetooth/init/prj_16.conf
+++ b/tests/bluetooth/init/prj_16.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y
diff --git a/tests/bluetooth/init/prj_17.conf b/tests/bluetooth/init/prj_17.conf
index 8aaffb22f..cda4b7ad5 100644
--- a/tests/bluetooth/init/prj_17.conf
+++ b/tests/bluetooth/init/prj_17.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_18.conf b/tests/bluetooth/init/prj_18.conf
index f33094d0a..52ac39ded 100644
--- a/tests/bluetooth/init/prj_18.conf
+++ b/tests/bluetooth/init/prj_18.conf
@@ -1,4 +1,3 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_BREDR=y
diff --git a/tests/bluetooth/init/prj_19.conf b/tests/bluetooth/init/prj_19.conf
index a3dcee9c1..b64d61dae 100644
--- a/tests/bluetooth/init/prj_19.conf
+++ b/tests/bluetooth/init/prj_19.conf
@@ -1,4 +1,3 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_BREDR=y
diff --git a/tests/bluetooth/init/prj_2.conf b/tests/bluetooth/init/prj_2.conf
index b7adcd175..174407a45 100644
--- a/tests/bluetooth/init/prj_2.conf
+++ b/tests/bluetooth/init/prj_2.conf
@@ -1,3 +1,2 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_CENTRAL=y
diff --git a/tests/bluetooth/init/prj_20.conf b/tests/bluetooth/init/prj_20.conf
index fc68dd0ba..020c6ee1c 100644
--- a/tests/bluetooth/init/prj_20.conf
+++ b/tests/bluetooth/init/prj_20.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_21.conf b/tests/bluetooth/init/prj_21.conf
index 783b82825..59bdae8a7 100644
--- a/tests/bluetooth/init/prj_21.conf
+++ b/tests/bluetooth/init/prj_21.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_22.conf b/tests/bluetooth/init/prj_22.conf
index f1c937349..b0ea11330 100644
--- a/tests/bluetooth/init/prj_22.conf
+++ b/tests/bluetooth/init/prj_22.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_BREDR=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_3.conf b/tests/bluetooth/init/prj_3.conf
index c05c0406f..f40515158 100644
--- a/tests/bluetooth/init/prj_3.conf
+++ b/tests/bluetooth/init/prj_3.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 
diff --git a/tests/bluetooth/init/prj_4.conf b/tests/bluetooth/init/prj_4.conf
index a528a852b..c866deb2c 100644
--- a/tests/bluetooth/init/prj_4.conf
+++ b/tests/bluetooth/init/prj_4.conf
@@ -1,4 +1,3 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_5.conf b/tests/bluetooth/init/prj_5.conf
index fe95f26bd..9cbaa0fad 100644
--- a/tests/bluetooth/init/prj_5.conf
+++ b/tests/bluetooth/init/prj_5.conf
@@ -1,4 +1,3 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_6.conf b/tests/bluetooth/init/prj_6.conf
index 6d6237b9d..2e894702e 100644
--- a/tests/bluetooth/init/prj_6.conf
+++ b/tests/bluetooth/init/prj_6.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_7.conf b/tests/bluetooth/init/prj_7.conf
index de34ff986..34e3a4d06 100644
--- a/tests/bluetooth/init/prj_7.conf
+++ b/tests/bluetooth/init/prj_7.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_8.conf b/tests/bluetooth/init/prj_8.conf
index 1ec4fc98a..eda75b95a 100644
--- a/tests/bluetooth/init/prj_8.conf
+++ b/tests/bluetooth/init/prj_8.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_9.conf b/tests/bluetooth/init/prj_9.conf
index 94c98eced..ea314fa27 100644
--- a/tests/bluetooth/init/prj_9.conf
+++ b/tests/bluetooth/init/prj_9.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_controller.conf b/tests/bluetooth/init/prj_controller.conf
index 008c28785..fcade189e 100644
--- a/tests/bluetooth/init/prj_controller.conf
+++ b/tests/bluetooth/init/prj_controller.conf
@@ -1,6 +1,5 @@
 CONFIG_BLUETOOTH=y
 CONFIG_BLUETOOTH_CONTROLLER=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_controller_dbg.conf b/tests/bluetooth/init/prj_controller_dbg.conf
index cb6005d12..b90f28f00 100644
--- a/tests/bluetooth/init/prj_controller_dbg.conf
+++ b/tests/bluetooth/init/prj_controller_dbg.conf
@@ -1,6 +1,5 @@
 CONFIG_BLUETOOTH=y
 CONFIG_BLUETOOTH_CONTROLLER=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/init/prj_h5.conf b/tests/bluetooth/init/prj_h5.conf
index 07ccd6c8b..da8f70f0c 100644
--- a/tests/bluetooth/init/prj_h5.conf
+++ b/tests/bluetooth/init/prj_h5.conf
@@ -1,3 +1,2 @@
 CONFIG_BLUETOOTH=y
 CONFIG_BLUETOOTH_H5=y
-CONFIG_BLUETOOTH_LE=y
diff --git a/tests/bluetooth/init/prj_h5_dbg.conf b/tests/bluetooth/init/prj_h5_dbg.conf
index f1ddecd69..bc93e92f4 100644
--- a/tests/bluetooth/init/prj_h5_dbg.conf
+++ b/tests/bluetooth/init/prj_h5_dbg.conf
@@ -1,5 +1,4 @@
 CONFIG_BLUETOOTH=y
 CONFIG_BLUETOOTH_H5=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y
diff --git a/tests/bluetooth/shell/arduino_101.conf b/tests/bluetooth/shell/arduino_101.conf
index d74600561..d4133e370 100644
--- a/tests/bluetooth/shell/arduino_101.conf
+++ b/tests/bluetooth/shell/arduino_101.conf
@@ -1,6 +1,5 @@
 CONFIG_MINIMAL_LIBC_EXTENDED=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_CENTRAL=y
diff --git a/tests/bluetooth/shell/prj.conf b/tests/bluetooth/shell/prj.conf
index 32d7da1ac..02bff1a02 100644
--- a/tests/bluetooth/shell/prj.conf
+++ b/tests/bluetooth/shell/prj.conf
@@ -1,6 +1,5 @@
 CONFIG_MINIMAL_LIBC_EXTENDED=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_CENTRAL=y
diff --git a/tests/bluetooth/shell/prj_br.conf b/tests/bluetooth/shell/prj_br.conf
index a8326eecf..f4d8b9e8f 100644
--- a/tests/bluetooth/shell/prj_br.conf
+++ b/tests/bluetooth/shell/prj_br.conf
@@ -1,6 +1,5 @@
 CONFIG_MINIMAL_LIBC_EXTENDED=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_BREDR=y
 CONFIG_BLUETOOTH_RFCOMM=y
 CONFIG_CONSOLE_HANDLER=y
diff --git a/tests/bluetooth/shell/prj_nble.conf b/tests/bluetooth/shell/prj_nble.conf
index b7cf433e0..48b29679b 100644
--- a/tests/bluetooth/shell/prj_nble.conf
+++ b/tests/bluetooth/shell/prj_nble.conf
@@ -1,7 +1,7 @@
 CONFIG_MINIMAL_LIBC_EXTENDED=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_CONSOLE_HANDLER_SHELL=y
diff --git a/tests/bluetooth/shell/prj_nimble.conf b/tests/bluetooth/shell/prj_nimble.conf
index 3acf1bd91..2bea75a61 100644
--- a/tests/bluetooth/shell/prj_nimble.conf
+++ b/tests/bluetooth/shell/prj_nimble.conf
@@ -1,6 +1,5 @@
 CONFIG_MINIMAL_LIBC_EXTENDED=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_BLUETOOTH_CENTRAL=y
diff --git a/tests/bluetooth/test_bluetooth/prj.conf b/tests/bluetooth/test_bluetooth/prj.conf
index 265515d82..f78f1f77c 100644
--- a/tests/bluetooth/test_bluetooth/prj.conf
+++ b/tests/bluetooth/test_bluetooth/prj.conf
@@ -2,7 +2,6 @@
 # This option is NOT to be used in production code.
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_NO_DRIVER=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
 CONFIG_UART_INTERRUPT_DRIVEN=n
diff --git a/tests/bluetooth/tester/default.conf b/tests/bluetooth/tester/default.conf
index de7a57c04..dd18ea322 100644
--- a/tests/bluetooth/tester/default.conf
+++ b/tests/bluetooth/tester/default.conf
@@ -1,7 +1,6 @@
 CONFIG_UART_PIPE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/tester/nble.conf b/tests/bluetooth/tester/nble.conf
index dd43eb085..0993e77a6 100644
--- a/tests/bluetooth/tester/nble.conf
+++ b/tests/bluetooth/tester/nble.conf
@@ -1,7 +1,7 @@
 CONFIG_UART_PIPE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_STACK_NBLE=y
+CONFIG_BLUETOOTH_CUSTOM=y
 CONFIG_NBLE=y
 CONFIG_UART_CONSOLE=n
 CONFIG_BLUETOOTH_ATT_PREPARE_COUNT=4
diff --git a/tests/bluetooth/tester/nimble.conf b/tests/bluetooth/tester/nimble.conf
index aaf2cae07..2d9d9d36c 100644
--- a/tests/bluetooth/tester/nimble.conf
+++ b/tests/bluetooth/tester/nimble.conf
@@ -1,7 +1,6 @@
 CONFIG_UART_PIPE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_SMP=y
diff --git a/tests/bluetooth/tester/qemu.conf b/tests/bluetooth/tester/qemu.conf
index 0c6d704bb..83fd50fe7 100644
--- a/tests/bluetooth/tester/qemu.conf
+++ b/tests/bluetooth/tester/qemu.conf
@@ -1,7 +1,6 @@
 CONFIG_UART_PIPE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_CENTRAL=y
 CONFIG_BLUETOOTH_PERIPHERAL=y
 CONFIG_BLUETOOTH_SMP=y