From 0e7067c6bef9275c7306af6024ab7e92e18e7166 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 20 Jul 2017 15:03:58 -0500 Subject: [PATCH] arm: dts: cleanup uart related Kconfig options Now that we generate BLUETOOTH_UART_ON_DEV_NAME, UART_PIPE_ON_DEV_NAME, and BLUETOOTH_MONITOR_ON_DEV_NAME Kconfig defines for dts enabled platforms add those into the appropriate dts files and remove from the various board/Kconfig.defconfig files. Signed-off-by: Kumar Gala --- arch/arm/soc/ti_lm3s6965/Kconfig.defconfig | 9 --------- boards/arm/frdm_k64f/Kconfig.defconfig | 3 --- boards/arm/hexiwear_k64/Kconfig.defconfig | 3 --- dts/arm/frdm_k64f.dts | 3 +++ dts/arm/hexiwear_k64.dts | 3 +++ dts/arm/qemu_cortex_m3.dts | 3 +++ 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/arch/arm/soc/ti_lm3s6965/Kconfig.defconfig b/arch/arm/soc/ti_lm3s6965/Kconfig.defconfig index 0ccddbcce5f..553068e35b4 100644 --- a/arch/arm/soc/ti_lm3s6965/Kconfig.defconfig +++ b/arch/arm/soc/ti_lm3s6965/Kconfig.defconfig @@ -34,13 +34,4 @@ config UART_STELLARIS_PORT_2 endif # UART_STELLARIS -config BLUETOOTH_UART_ON_DEV_NAME - default "UART_1" if BLUETOOTH_UART - -config UART_PIPE_ON_DEV_NAME - default "UART_1" if UART_PIPE - -config BLUETOOTH_MONITOR_ON_DEV_NAME - default "UART_2" if BLUETOOTH_DEBUG_MONITOR - endif diff --git a/boards/arm/frdm_k64f/Kconfig.defconfig b/boards/arm/frdm_k64f/Kconfig.defconfig index 8f3e6941a96..5fe7489fc47 100644 --- a/boards/arm/frdm_k64f/Kconfig.defconfig +++ b/boards/arm/frdm_k64f/Kconfig.defconfig @@ -32,9 +32,6 @@ config UART_MCUX_3 endif # UART_MCUX -config BLUETOOTH_UART_ON_DEV_NAME - default "UART_3" if BLUETOOTH_UART - config PINMUX def_bool y diff --git a/boards/arm/hexiwear_k64/Kconfig.defconfig b/boards/arm/hexiwear_k64/Kconfig.defconfig index bdbd7cee52b..ada55e66a38 100644 --- a/boards/arm/hexiwear_k64/Kconfig.defconfig +++ b/boards/arm/hexiwear_k64/Kconfig.defconfig @@ -32,9 +32,6 @@ config UART_MCUX_4 endif # UART_MCUX -config BLUETOOTH_UART_ON_DEV_NAME - default "UART_4" if BLUETOOTH_UART - config PINMUX def_bool y diff --git a/dts/arm/frdm_k64f.dts b/dts/arm/frdm_k64f.dts index b2d60c5144f..f584d4c293a 100644 --- a/dts/arm/frdm_k64f.dts +++ b/dts/arm/frdm_k64f.dts @@ -30,6 +30,9 @@ zephyr,sram = &sram0; zephyr,flash = &flash0; zephyr,console = &uart0; +#ifdef CONFIG_BLUETOOTH + zephyr,bt-uart = &uart3; +#endif zephyr,uart-pipe = &uart0; }; }; diff --git a/dts/arm/hexiwear_k64.dts b/dts/arm/hexiwear_k64.dts index b8bb5714b82..c9a7fba6666 100644 --- a/dts/arm/hexiwear_k64.dts +++ b/dts/arm/hexiwear_k64.dts @@ -30,6 +30,9 @@ zephyr,sram = &sram0; zephyr,flash = &flash0; zephyr,console = &uart0; +#ifdef CONFIG_BLUETOOTH + zephyr,bt-uart = &uart4; +#endif }; }; diff --git a/dts/arm/qemu_cortex_m3.dts b/dts/arm/qemu_cortex_m3.dts index 6b51ee53112..9c2dd9076b8 100644 --- a/dts/arm/qemu_cortex_m3.dts +++ b/dts/arm/qemu_cortex_m3.dts @@ -16,6 +16,9 @@ zephyr,sram = &sram0; zephyr,flash = &flash0; zephyr,console = &uart0; + zephyr,bt-uart = &uart1; + zephyr,uart-pipe = &uart1; + zephyr,bt-mon-uart = &uart2; }; };