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 <johan.hedberg@intel.com>
This commit is contained in:
parent
cc5be1eb96
commit
900fbc20ba
6 changed files with 10 additions and 19 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue