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>

20 files changed, 10 insertions, 20 deletions

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