From b64e0d4c516f080ae5c4fd09c3973c74a9441f48 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 9 Nov 2016 16:18:56 +0200 Subject: [PATCH] Bluetooth: Kconfig: Remove redundant 'default n' declarations All boolean options default to 'n' without the need to explicitly state this. It's only the cases where we want 'default y' where we need to state this. Change-Id: I47dbda62462ea437a2423b8508ea2cc640a22e41 Signed-off-by: Johan Hedberg --- drivers/bluetooth/hci/Kconfig | 3 --- drivers/bluetooth/nble/Kconfig | 5 ----- subsys/bluetooth/Kconfig | 1 - subsys/bluetooth/host/Kconfig | 32 -------------------------------- 4 files changed, 41 deletions(-) diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig index e54555f7b1c..bb33dfb8047 100644 --- a/drivers/bluetooth/hci/Kconfig +++ b/drivers/bluetooth/hci/Kconfig @@ -24,7 +24,6 @@ if !BLUETOOTH_CONTROLLER config BLUETOOTH_UART bool - default n choice prompt "Bluetooth HCI driver" @@ -62,7 +61,6 @@ endif # !BLUETOOTH_CONTROLLER config BLUETOOTH_HOST_BUFFERS bool "Host managed incoming data buffers" - default n help Enable this to have the host stack manage incoming ACL data and HCI event buffers. This makes sense for all HCI drivers @@ -75,7 +73,6 @@ config BLUETOOTH_HOST_BUFFERS config BLUETOOTH_DEBUG_HCI_DRIVER bool "Bluetooth HCI driver debug" depends on BLUETOOTH_DEBUG - default n help This option enables debug support for the chosen Bluetooth HCI driver diff --git a/drivers/bluetooth/nble/Kconfig b/drivers/bluetooth/nble/Kconfig index 8030f5e6c07..78b50f0cb9e 100644 --- a/drivers/bluetooth/nble/Kconfig +++ b/drivers/bluetooth/nble/Kconfig @@ -82,21 +82,18 @@ if BLUETOOTH_DEBUG config BLUETOOTH_DEBUG_HCI_DRIVER bool "Bluetooth driver debug" - default n 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" - default n help This option enables debug support for the Bluetooth Generic Attribute Profile (GATT). config NBLE_DEBUG_GAP bool "NBLE Generic Access Profile (GAP) debug" - default n help This option enables debug support for the Bluetooth Generic Access Profile (GAP) in the interfaces to the @@ -104,14 +101,12 @@ config NBLE_DEBUG_GAP config NBLE_DEBUG_CONN bool "NBLE connection debug" - default n help This option enables debug support for Bluetooth connections in the nble driver. config NBLE_DEBUG_RPC bool "NBLE RPC debug" - default n help This option enables debug for RPC interface to the Nordic Bluetooth LE chip. diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig index 533c9552a78..6ec55e0c706 100644 --- a/subsys/bluetooth/Kconfig +++ b/subsys/bluetooth/Kconfig @@ -17,7 +17,6 @@ menuconfig BLUETOOTH bool "Bluetooth support" - default n select NANO_TIMEOUTS select NET_BUF help diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig index 4ff3951e182..89c04b34f28 100644 --- a/subsys/bluetooth/host/Kconfig +++ b/subsys/bluetooth/host/Kconfig @@ -123,21 +123,18 @@ config BLUETOOTH_RX_STACK_SIZE config BLUETOOTH_PERIPHERAL bool "Peripheral Role support" - default n select BLUETOOTH_CONN help Select this for LE Peripheral role support. config BLUETOOTH_CENTRAL bool "Central Role support" - default n select BLUETOOTH_CONN help Select this for LE Central role support. config BLUETOOTH_CONN bool - default n if BLUETOOTH_CONN config BLUETOOTH_ATT_MTU @@ -170,7 +167,6 @@ 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 (SMP), making it possible to pair devices over LE. @@ -178,7 +174,6 @@ config BLUETOOTH_SMP if BLUETOOTH_SMP config BLUETOOTH_PRIVACY bool "Privacy Feature" - default n help Enable local Privacy Feature support. This makes it possible to use Resolvable Private Addresses (RPAs). @@ -194,14 +189,12 @@ config BLUETOOTH_RPA_TIMEOUT config BLUETOOTH_SIGNING bool "Data signing support" - default n help This option enables data signing which is used for transferring authenticated data in an unencrypted connection. config BLUETOOTH_SMP_SC_ONLY bool "Secure Connections Only Mode" - default n help This option enables support for Secure Connection Only Mode. In this mode device shall only use Security Mode 1 Level 4 with exception @@ -211,7 +204,6 @@ config BLUETOOTH_SMP_SC_ONLY config BLUETOOTH_USE_DEBUG_KEYS bool "Enable Security Manager Debug Mode" - default n depends on BLUETOOTH_TINYCRYPT_ECC help This option places Security Manager in a Debug Mode. In this mode @@ -226,20 +218,17 @@ endif # BLUETOOTH_SMP config BLUETOOTH_L2CAP_DYNAMIC_CHANNEL bool "L2CAP Dynamic Channel support" depends on BLUETOOTH_SMP - default n help This option enables support for LE Connection oriented Channels, allowing the creation of dynamic L2CAP Channels. config BLUETOOTH_GATT_DYNAMIC_DB bool "GATT dynamic database support" - default n help This option enables GATT services to be added dynamically to database. config BLUETOOTH_GATT_CLIENT bool "GATT client support" - default n help This option enables support for the GATT Client role. @@ -255,7 +244,6 @@ endif # BLUETOOTH_CONN config BLUETOOTH_TINYCRYPT_ECC bool "Use TinyCrypt library for ECDH" - default n select TINYCRYPT_ECC_DH depends on MICROKERNEL help @@ -278,7 +266,6 @@ config BLUETOOTH_MAX_CONN config BLUETOOTH_DEBUG bool - default n choice prompt "Bluetooth debug type" @@ -337,7 +324,6 @@ if BLUETOOTH_DEBUG config BLUETOOTH_DEBUG_HCI_CORE bool "Bluetooth HCI core debug" depends on BLUETOOTH_HCI_HOST - default n help This option enables debug support for Bluetooth HCI core. @@ -345,7 +331,6 @@ config BLUETOOTH_DEBUG_HCI_CORE config BLUETOOTH_DEBUG_CONN bool "Bluetooth connection debug" depends on BLUETOOTH_CONN - default n help This option enables debug support for Bluetooth connection handling. @@ -354,7 +339,6 @@ config BLUETOOTH_DEBUG_KEYS bool "Bluetooth security keys debug" depends on BLUETOOTH_HCI_HOST depends on BLUETOOTH_SMP - default n help This option enables debug support for the handling of Bluetooth security keys. @@ -362,7 +346,6 @@ config BLUETOOTH_DEBUG_KEYS config BLUETOOTH_DEBUG_L2CAP bool "Bluetooth L2CAP debug" depends on BLUETOOTH_CONN - default n help This option enables debug support for the Bluetooth L2ACP layer. @@ -371,7 +354,6 @@ config BLUETOOTH_DEBUG_SMP bool "Bluetooth Security Manager Protocol (SMP) debug" depends on BLUETOOTH_HCI_HOST depends on BLUETOOTH_SMP - default n help This option enables debug support for the Bluetooth Security Manager Protocol (SMP). @@ -379,7 +361,6 @@ config BLUETOOTH_DEBUG_SMP config BLUETOOTH_SMP_SELFTEST bool "Bluetooth SMP self tests executed on init" depends on BLUETOOTH_DEBUG_SMP - default n help This option enables SMP self-tests executed on startup to verify security and crypto functions. @@ -387,7 +368,6 @@ config BLUETOOTH_SMP_SELFTEST config BLUETOOTH_SMP_FORCE_BREDR bool "Force Bluetooth SMP over BR/EDR" depends on BLUETOOTH_DEBUG_SMP - default n help This option enables SMP over BR/EDR even if controller is not supporting BR/EDR Secure Connections. This optino is solely for @@ -396,7 +376,6 @@ config BLUETOOTH_SMP_FORCE_BREDR config BLUETOOTH_DEBUG_ATT bool "Bluetooth Attribute Protocol (ATT) debug" depends on BLUETOOTH_CONN - default n help This option enables debug support for the Bluetooth Attribute Protocol (ATT). @@ -404,7 +383,6 @@ config BLUETOOTH_DEBUG_ATT config BLUETOOTH_DEBUG_GATT bool "Bluetooth Generic Attribute Profile (GATT) debug" depends on BLUETOOTH_CONN - default n help This option enables debug support for the Bluetooth Generic Attribute Profile (GATT). @@ -412,7 +390,6 @@ config BLUETOOTH_DEBUG_GATT config BLUETOOTH_DEBUG_RFCOMM bool "Bluetooth RFCOMM debug" depends on BLUETOOTH_RFCOMM - default n help This option enables debug support for the Bluetooth RFCOMM layer. @@ -420,7 +397,6 @@ config BLUETOOTH_DEBUG_RFCOMM config BLUETOOTH_DEBUG_HFP_HF bool "Bluetooth Hands Free Profile (HFP) debug" depends on BLUETOOTH_HFP_HF - default n help This option enables debug support for the Bluetooth Hands Free Profile (HFP). @@ -428,14 +404,12 @@ config BLUETOOTH_DEBUG_HFP_HF config BLUETOOTH_DEBUG_AVDTP bool "Bluetooth AVDTP debug" depends on BLUETOOTH_AVDTP - default n help This option enables debug support for the Bluetooth AVDTP. config BLUETOOTH_DEBUG_A2DP bool "Bluetooth A2DP debug" depends on BLUETOOTH_A2DP - default n help This option enables debug support for the Bluetooth A2DP profile. @@ -443,7 +417,6 @@ config BLUETOOTH_DEBUG_A2DP config BLUETOOTH_DEBUG_SDP bool "Bluetooth Service Discovery Protocol (SDP) debug" depends on BLUETOOTH_BREDR - default n help This option enables debug support for the Bluetooth Service Discovery Protocol (SDP). @@ -452,7 +425,6 @@ endif # BLUETOOTH_DEBUG config BLUETOOTH_BREDR bool "Bluetooth BR/EDR support [EXPERIMENTAL]" - default n depends on BLUETOOTH_HCI_HOST select BLUETOOTH_CONN select BLUETOOTH_L2CAP_DYNAMIC_CHANNEL @@ -462,7 +434,6 @@ config BLUETOOTH_BREDR if BLUETOOTH_BREDR config BLUETOOTH_RFCOMM bool "Bluetooth RFCOMM protocol support [EXPERIMENTAL]" - default n help This option enables Bluetooth RFCOMM support @@ -476,20 +447,17 @@ config BLUETOOTH_RFCOMM_L2CAP_MTU config BLUETOOTH_HFP_HF bool "Bluetooth Handsfree profile HF Role support [EXPERIMENTAL]" - default n select BLUETOOTH_RFCOMM help This option enables Bluetooth HF support config BLUETOOTH_AVDTP bool "Bluetooth AVDTP protocol support [EXPERIMENTAL]" - default n help This option enables Bluetooth AVDTP support config BLUETOOTH_A2DP bool "Bluetooth A2DP Profile [EXPERIMENTAL]" - default n select BLUETOOTH_AVDTP help This option enables the A2DP profile