michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: fix Kconfig enablment of BLUETOOTH_MONITOR_ON_DEV_NAME

Browse source 
Since we generate BLUETOOTH_MONITOR_ON_DEV_NAME based on dts we need a
!HAS_DTS check around it.  Otherwise we can get into odd build errors.
Its also possibly that we don't specify "zephyr,bt-mon-uart" and in that
case we default to CONFIG_UART_CONSOLE_ON_DEV_NAME (ie 'zephyr,console'
on DTS platforms).

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2017-07-25 09:22:26 -05:00 • committed by Kumar Gala
commit a45dac0bd1
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/common/Kconfig
View file

@ -66,6 +66,7 @@ config BLUETOOTH_DEBUG_COLOR
help help
Use color in the logs. This requires an ANSI capable terminal. Use color in the logs. This requires an ANSI capable terminal.
if !HAS_DTS
config BLUETOOTH_MONITOR_ON_DEV_NAME config BLUETOOTH_MONITOR_ON_DEV_NAME
string "Device Name of Bluetooth monitor logging UART" string "Device Name of Bluetooth monitor logging UART"
depends on BLUETOOTH_DEBUG_MONITOR depends on BLUETOOTH_DEBUG_MONITOR
@ -73,6 +74,7 @@ config BLUETOOTH_MONITOR_ON_DEV_NAME
help help
This option specifies the name of UART device to be used This option specifies the name of UART device to be used
for the Bluetooth monitor logging. for the Bluetooth monitor logging.
endif
config BLUETOOTH_DEBUG_HCI_DRIVER config BLUETOOTH_DEBUG_HCI_DRIVER
bool "Bluetooth HCI driver debug" bool "Bluetooth HCI driver debug"

4
subsys/bluetooth/host/monitor.c
View file

@ -237,6 +237,10 @@ extern void __printk_hook_install(int (*fn)(int));
extern void __stdout_hook_install(int (*fn)(int)); extern void __stdout_hook_install(int (*fn)(int));
#endif /* !CONFIG_UART_CONSOLE */ #endif /* !CONFIG_UART_CONSOLE */
#if defined(CONFIG_HAS_DTS) && !defined(CONFIG_BLUETOOTH_MONITOR_ON_DEV_NAME)
#define CONFIG_BLUETOOTH_MONITOR_ON_DEV_NAME CONFIG_UART_CONSOLE_ON_DEV_NAME
#endif
static int bt_monitor_init(struct device *d) static int bt_monitor_init(struct device *d)
{ {
ARG_UNUSED(d); ARG_UNUSED(d);