From cb29e6135dcd23e9cf1cc897391b742de12c4279 Mon Sep 17 00:00:00 2001 From: Arkadiusz Lichwa Date: Wed, 11 Nov 2015 20:40:49 +0100 Subject: [PATCH] Bluetooth: Kconfig: Change topmost option Refactors existing menu by putting as topmost selectable option general bluetooth subsystem support instead so far Low Energy (LE). Implication of the change is introduction of new BLUETOOTH_LE config flag. The flag needs to be propagated to all existing bluetooth related apps to make them buildable. Change-Id: I608c1baad038e0ee4cccf44a3e597e16ae1f7f54 Signed-off-by: Arkadiusz Lichwa --- net/bluetooth/Kconfig | 13 +++++++++++-- samples/bluetooth/beacon/prj_arm.conf | 1 + samples/bluetooth/beacon/prj_x86.conf | 1 + samples/bluetooth/central/prj_x86.conf | 1 + samples/bluetooth/init/prj_x86.conf | 1 + samples/bluetooth/peripheral/prj_arm.conf | 1 + samples/bluetooth/peripheral/prj_x86.conf | 1 + samples/bluetooth/shell/prj_arm.conf | 1 + samples/bluetooth/shell/prj_x86.conf | 1 + samples/bluetooth/tester/prj_arm.conf | 1 + samples/bluetooth/tester/prj_x86.conf | 1 + .../microkernel/test/test_bluetooth/prj_arm.conf | 1 + .../microkernel/test/test_bluetooth/prj_x86.conf | 1 + samples/nanokernel/test/test_bluetooth/prj_arm.conf | 1 + samples/nanokernel/test/test_bluetooth/prj_x86.conf | 1 + 15 files changed, 25 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig index 75068160ed1..b8796ed903a 100644 --- a/net/bluetooth/Kconfig +++ b/net/bluetooth/Kconfig @@ -17,14 +17,21 @@ # menuconfig BLUETOOTH - bool "Bluetooth LE support" + bool "Bluetooth support" default n select NANO_TIMEOUTS select NET_BUF help - This option enables Bluetooth Low Energy support. + This option enables Bluetooth support. if BLUETOOTH +config BLUETOOTH_LE + bool "Bluetooth Low Energy (LE) support" + default n + help + This option enables Bluetooth Low Energy (LE)" + +if BLUETOOTH_LE config BLUETOOTH_HCI_CMD_COUNT int "Number of HCI command buffers" default 2 @@ -224,4 +231,6 @@ config BLUETOOTH_DEBUG_GATT endif # BLUETOOTH_DEBUG +endif # BLUETOOTH_LE + endif # BLUETOOTH diff --git a/samples/bluetooth/beacon/prj_arm.conf b/samples/bluetooth/beacon/prj_arm.conf index 6e1292ea473..9bb39643da6 100644 --- a/samples/bluetooth/beacon/prj_arm.conf +++ b/samples/bluetooth/beacon/prj_arm.conf @@ -1,4 +1,5 @@ CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_BLUETOOTH_DEBUG=y CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/samples/bluetooth/beacon/prj_x86.conf b/samples/bluetooth/beacon/prj_x86.conf index 467e69adfa8..1e8ed57a11f 100644 --- a/samples/bluetooth/beacon/prj_x86.conf +++ b/samples/bluetooth/beacon/prj_x86.conf @@ -1,4 +1,5 @@ CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_BLUETOOTH_DEBUG=y diff --git a/samples/bluetooth/central/prj_x86.conf b/samples/bluetooth/central/prj_x86.conf index c392b7e49db..5cbf2b76554 100644 --- a/samples/bluetooth/central/prj_x86.conf +++ b/samples/bluetooth/central/prj_x86.conf @@ -1,5 +1,6 @@ CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_BLUETOOTH_DEBUG=y CONFIG_BLUETOOTH_CENTRAL=y diff --git a/samples/bluetooth/init/prj_x86.conf b/samples/bluetooth/init/prj_x86.conf index 467e69adfa8..1e8ed57a11f 100644 --- a/samples/bluetooth/init/prj_x86.conf +++ b/samples/bluetooth/init/prj_x86.conf @@ -1,4 +1,5 @@ CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_BLUETOOTH_DEBUG=y diff --git a/samples/bluetooth/peripheral/prj_arm.conf b/samples/bluetooth/peripheral/prj_arm.conf index 1839e92d3e4..d67cf6418a6 100644 --- a/samples/bluetooth/peripheral/prj_arm.conf +++ b/samples/bluetooth/peripheral/prj_arm.conf @@ -1,4 +1,5 @@ CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_BLUETOOTH_DEBUG=y CONFIG_BLUETOOTH_SMP=y diff --git a/samples/bluetooth/peripheral/prj_x86.conf b/samples/bluetooth/peripheral/prj_x86.conf index c4836ca9784..bd0849ff748 100644 --- a/samples/bluetooth/peripheral/prj_x86.conf +++ b/samples/bluetooth/peripheral/prj_x86.conf @@ -1,5 +1,6 @@ CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_BLUETOOTH_DEBUG=y CONFIG_BLUETOOTH_SMP=y diff --git a/samples/bluetooth/shell/prj_arm.conf b/samples/bluetooth/shell/prj_arm.conf index 629abefccb4..1d911e17771 100644 --- a/samples/bluetooth/shell/prj_arm.conf +++ b/samples/bluetooth/shell/prj_arm.conf @@ -1,6 +1,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_MINIMAL_LIBC_EXTENDED=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_BLUETOOTH_DEBUG=y CONFIG_CONSOLE_HANDLER=y diff --git a/samples/bluetooth/shell/prj_x86.conf b/samples/bluetooth/shell/prj_x86.conf index 8da2307df65..fdeec7a4dff 100644 --- a/samples/bluetooth/shell/prj_x86.conf +++ b/samples/bluetooth/shell/prj_x86.conf @@ -2,6 +2,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_MINIMAL_LIBC_EXTENDED=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_CONSOLE_HANDLER=y CONFIG_BLUETOOTH_DEBUG=y diff --git a/samples/bluetooth/tester/prj_arm.conf b/samples/bluetooth/tester/prj_arm.conf index 7272c1a2768..f54677c33de 100644 --- a/samples/bluetooth/tester/prj_arm.conf +++ b/samples/bluetooth/tester/prj_arm.conf @@ -2,6 +2,7 @@ CONFIG_UART_SIMPLE=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_CONSOLE_HANDLER=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_BLUETOOTH_CENTRAL=y CONFIG_BLUETOOTH_PERIPHERAL=y diff --git a/samples/bluetooth/tester/prj_x86.conf b/samples/bluetooth/tester/prj_x86.conf index 7272c1a2768..f54677c33de 100644 --- a/samples/bluetooth/tester/prj_x86.conf +++ b/samples/bluetooth/tester/prj_x86.conf @@ -2,6 +2,7 @@ CONFIG_UART_SIMPLE=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_CONSOLE_HANDLER=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=y CONFIG_BLUETOOTH_CENTRAL=y CONFIG_BLUETOOTH_PERIPHERAL=y diff --git a/samples/microkernel/test/test_bluetooth/prj_arm.conf b/samples/microkernel/test/test_bluetooth/prj_arm.conf index ea007066962..8f873e69dee 100644 --- a/samples/microkernel/test/test_bluetooth/prj_arm.conf +++ b/samples/microkernel/test/test_bluetooth/prj_arm.conf @@ -2,6 +2,7 @@ # This option is NOT to be used in production code. CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=n CONFIG_BLUETOOTH_DEBUG=y CONFIG_UART_INTERRUPT_DRIVEN=n diff --git a/samples/microkernel/test/test_bluetooth/prj_x86.conf b/samples/microkernel/test/test_bluetooth/prj_x86.conf index ea007066962..8f873e69dee 100644 --- a/samples/microkernel/test/test_bluetooth/prj_x86.conf +++ b/samples/microkernel/test/test_bluetooth/prj_x86.conf @@ -2,6 +2,7 @@ # This option is NOT to be used in production code. CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=n CONFIG_BLUETOOTH_DEBUG=y CONFIG_UART_INTERRUPT_DRIVEN=n diff --git a/samples/nanokernel/test/test_bluetooth/prj_arm.conf b/samples/nanokernel/test/test_bluetooth/prj_arm.conf index ea007066962..8f873e69dee 100644 --- a/samples/nanokernel/test/test_bluetooth/prj_arm.conf +++ b/samples/nanokernel/test/test_bluetooth/prj_arm.conf @@ -2,6 +2,7 @@ # This option is NOT to be used in production code. CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=n CONFIG_BLUETOOTH_DEBUG=y CONFIG_UART_INTERRUPT_DRIVEN=n diff --git a/samples/nanokernel/test/test_bluetooth/prj_x86.conf b/samples/nanokernel/test/test_bluetooth/prj_x86.conf index ea007066962..8f873e69dee 100644 --- a/samples/nanokernel/test/test_bluetooth/prj_x86.conf +++ b/samples/nanokernel/test/test_bluetooth/prj_x86.conf @@ -2,6 +2,7 @@ # This option is NOT to be used in production code. CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_BLUETOOTH=y +CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_UART=n CONFIG_BLUETOOTH_DEBUG=y CONFIG_UART_INTERRUPT_DRIVEN=n