From 8a7eeeb7f1602aee4dac022248befc3514f1e53a Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Fri, 5 May 2017 15:45:34 +0200
Subject: [PATCH] Bluetooth: Move HCI driver debug to top-level Kconfig

Since the HCI driver debug option applies to both files in
drivers/bluetooth and subsys/bluetooth, the configuration option itself
now lives in the top-level Kconfig file for consistency.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
---
 drivers/bluetooth/hci/Kconfig  | 7 -------
 drivers/bluetooth/nble/Kconfig | 6 ------
 subsys/bluetooth/Kconfig       | 9 +++++++++
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig
index e143e740c7d..88ed541d962 100644
--- a/drivers/bluetooth/hci/Kconfig
+++ b/drivers/bluetooth/hci/Kconfig
@@ -58,13 +58,6 @@ endchoice
 
 endif # !BLUETOOTH_CONTROLLER
 
-config BLUETOOTH_DEBUG_HCI_DRIVER
-	bool "Bluetooth HCI driver debug"
-	depends on BLUETOOTH_DEBUG
-	help
-	  This option enables debug support for the chosen
-	  Bluetooth HCI driver
-
 config BLUETOOTH_UART_ON_DEV_NAME
 	string "Device Name of UART Device for Bluetooth"
 	default "UART_0"
diff --git a/drivers/bluetooth/nble/Kconfig b/drivers/bluetooth/nble/Kconfig
index 066605f51ec..651a2d51c98 100644
--- a/drivers/bluetooth/nble/Kconfig
+++ b/drivers/bluetooth/nble/Kconfig
@@ -79,12 +79,6 @@ config BLUETOOTH_DEVICE_NAME
 
 if BLUETOOTH_DEBUG
 
-config	BLUETOOTH_DEBUG_HCI_DRIVER
-	bool "Bluetooth driver debug"
-	help
-	  This option enables debug support for the chosen
-	  Bluetooth UART driver to Nordic chip.
-
 config BLUETOOTH_DEBUG_GATT
 	bool "Bluetooth Generic Attribute Profile (GATT) debug"
 	help
diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index 659e458c437..c63c2d7dc9e 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -127,6 +127,7 @@ config BLUETOOTH_DEBUG_MONITOR
 
 endchoice
 
+if BLUETOOTH_DEBUG
 config BLUETOOTH_DEBUG_COLOR
 	bool "Use colored logs"
 	depends on BLUETOOTH_DEBUG_LOG
@@ -143,6 +144,14 @@ config BLUETOOTH_MONITOR_ON_DEV_NAME
 	 This option specifies the name of UART device to be used
 	 for the Bluetooth monitor logging.
 
+config BLUETOOTH_DEBUG_HCI_DRIVER
+	bool "Bluetooth HCI driver debug"
+	depends on BLUETOOTH_DEBUG
+	help
+	  This option enables debug support for the active
+	  Bluetooth HCI driver, including the Controller-side HCI layer
+	  when included in the build.
+endif #BLUETOOTH_DEBUG
 
 source "subsys/bluetooth/host/Kconfig"
 source "subsys/bluetooth/controller/Kconfig"