From 900fbc20ba8f504b83ec96ab64bc469569b33e67 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 1 Nov 2016 12:56:40 +0200 Subject: [PATCH] boards: x86: Don't default to 'y' with NRF51_PM and WAIT_NOP These options were only needed for a MyNewt-based nRF51 firmware on these boards (the MyNewt BLE stack is called Nimble, hence the prj_nimble.conf sample config files). With a Zephyr-based nRF51 firmware these options are no-longer needed, so it's not appropriate to have them default to enabled. Instead, if they are needed, require the app-specific configuration to enable them. Change-Id: Iefbee4d97590af4e11bcedea05fe61f32a147b83 Signed-off-by: Johan Hedberg --- boards/x86/arduino_101/Kconfig.defconfig | 9 --------- boards/x86/quark_se_c1000_devboard/Kconfig.defconfig | 9 --------- drivers/bluetooth/Kconfig | 2 +- samples/environmental_sensing/x86/prj_nimble.conf | 3 +++ tests/bluetooth/shell/prj_nimble.conf | 3 +++ tests/bluetooth/tester/prj_nimble.conf | 3 +++ 6 files changed, 10 insertions(+), 19 deletions(-) diff --git a/boards/x86/arduino_101/Kconfig.defconfig b/boards/x86/arduino_101/Kconfig.defconfig index 0755619744d..e347d8fd51b 100644 --- a/boards/x86/arduino_101/Kconfig.defconfig +++ b/boards/x86/arduino_101/Kconfig.defconfig @@ -31,15 +31,6 @@ endif if BLUETOOTH_H4 -config GPIO - def_bool y - -config BLUETOOTH_NRF51_PM - def_bool y - -config BLUETOOTH_WAIT_NOP - def_bool y - config BLUETOOTH_UART_ON_DEV_NAME default UART_QMSI_0_NAME diff --git a/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig b/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig index a6219bf77c6..36f77011aba 100644 --- a/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig +++ b/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig @@ -25,15 +25,6 @@ endif if BLUETOOTH_H4 -config GPIO - def_bool y - -config BLUETOOTH_NRF51_PM - def_bool y - -config BLUETOOTH_WAIT_NOP - def_bool y - config BLUETOOTH_UART_ON_DEV_NAME default UART_QMSI_0_NAME diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 895eb425b3d..6d38c5755de 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -39,7 +39,7 @@ config BLUETOOTH_NRF51_PM config BLUETOOTH_WAIT_NOP bool "Wait for \"NOP\" Command Complete event during init" - depends on !BLUETOOTH_CONTROLLER + depends on BLUETOOTH_STACK_HCI || BLUETOOTH_STACK_HCI_RAW help Some controllers emit a Command Complete event for the NOP opcode to indicate that they're ready to receive commands. diff --git a/samples/environmental_sensing/x86/prj_nimble.conf b/samples/environmental_sensing/x86/prj_nimble.conf index 6156ba5e029..e71a9d74093 100644 --- a/samples/environmental_sensing/x86/prj_nimble.conf +++ b/samples/environmental_sensing/x86/prj_nimble.conf @@ -10,3 +10,6 @@ CONFIG_BLUETOOTH=y CONFIG_BLUETOOTH_LE=y CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BLUETOOTH_GATT_DYNAMIC_DB=y +CONFIG_GPIO=y +CONFIG_BLUETOOTH_WAIT_NOP=y +CONFIG_BLUETOOTH_NRF51_PM=y diff --git a/tests/bluetooth/shell/prj_nimble.conf b/tests/bluetooth/shell/prj_nimble.conf index 2c3e653c1a1..5981beb529f 100644 --- a/tests/bluetooth/shell/prj_nimble.conf +++ b/tests/bluetooth/shell/prj_nimble.conf @@ -12,3 +12,6 @@ CONFIG_BLUETOOTH_SIGNING=y CONFIG_BLUETOOTH_GATT_CLIENT=y CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y CONFIG_CONSOLE_HANDLER_SHELL=y +CONFIG_GPIO=y +CONFIG_BLUETOOTH_WAIT_NOP=y +CONFIG_BLUETOOTH_NRF51_PM=y diff --git a/tests/bluetooth/tester/prj_nimble.conf b/tests/bluetooth/tester/prj_nimble.conf index d94a132d850..aaf2cae0785 100644 --- a/tests/bluetooth/tester/prj_nimble.conf +++ b/tests/bluetooth/tester/prj_nimble.conf @@ -12,3 +12,6 @@ CONFIG_BLUETOOTH_GATT_CLIENT=y CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BLUETOOTH_PRIVACY=y CONFIG_UART_CONSOLE=n +CONFIG_GPIO=y +CONFIG_BLUETOOTH_WAIT_NOP=y +CONFIG_BLUETOOTH_NRF51_PM=y