From 32c6d979220cb89e728ebca44eca5b51f22e2bb8 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Tue, 29 Mar 2016 15:34:21 -0700 Subject: [PATCH] console/uart: remove duplicate default value for parent UART dev There is no need to re-define CONFIG_UART_CONSOLE_ON_DEV_NAME to be "UART_0" all over the place as its default is "UART_0" already. So remove those duplicate defaults. Change-Id: Ia86e26b8f90540fdbd7dcb3358d6dac352648b21 Signed-off-by: Daniel Leung --- arch/arm/defconfig | 1 - arch/arm/soc/atmel_sam3/Kconfig.defconfig | 3 --- arch/arm/soc/fsl_frdm_k64f/Kconfig.defconfig | 3 --- arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.family | 7 ------- arch/arm/soc/ti_lm3s6965/Kconfig.defconfig | 3 --- arch/x86/soc/atom/Kconfig.defconfig | 7 ------- arch/x86/soc/ia32/Kconfig.defconfig | 7 ------- arch/x86/soc/quark_d2000/Kconfig.defconfig | 7 ------- 8 files changed, 38 deletions(-) diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 71976f6271f..69e4e57bb6e 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -3,7 +3,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 CONFIG_SOC_TI_LM3S6965=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y -CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_0" CONFIG_SERIAL=y CONFIG_CORTEX_M_SYSTICK=y CONFIG_FLASH_SIZE=256 diff --git a/arch/arm/soc/atmel_sam3/Kconfig.defconfig b/arch/arm/soc/atmel_sam3/Kconfig.defconfig index 148819a8173..8aea61a847c 100644 --- a/arch/arm/soc/atmel_sam3/Kconfig.defconfig +++ b/arch/arm/soc/atmel_sam3/Kconfig.defconfig @@ -75,9 +75,6 @@ config UART_ATMEL_SAM3_CLK_FREQ endif # UART_ATMEL_SAM3 -config UART_CONSOLE_ON_DEV_NAME - default "UART_0" if UART_CONSOLE - if GPIO_ATMEL_SAM3 config GPIO_ATMEL_SAM3_PORTA diff --git a/arch/arm/soc/fsl_frdm_k64f/Kconfig.defconfig b/arch/arm/soc/fsl_frdm_k64f/Kconfig.defconfig index 187e6f69a60..c18b1bca055 100644 --- a/arch/arm/soc/fsl_frdm_k64f/Kconfig.defconfig +++ b/arch/arm/soc/fsl_frdm_k64f/Kconfig.defconfig @@ -91,9 +91,6 @@ endif endif # UART_K20 -config UART_CONSOLE_ON_DEV_NAME - default "UART_0" if UART_CONSOLE - config BLUETOOTH_UART_ON_DEV_NAME default "UART_1" if BLUETOOTH_UART diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.family b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.family index f0226d3d1f2..e1b33c8e88f 100644 --- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.family +++ b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.family @@ -32,11 +32,4 @@ config NUM_IRQ_PRIO_BITS int default 4 -if UART_CONSOLE - -config UART_CONSOLE_ON_DEV_NAME - default "UART_0" - -endif # UART_CONSOLE - endif # SOC_STM32F1X diff --git a/arch/arm/soc/ti_lm3s6965/Kconfig.defconfig b/arch/arm/soc/ti_lm3s6965/Kconfig.defconfig index 0e6a111156b..499ca4d36b2 100644 --- a/arch/arm/soc/ti_lm3s6965/Kconfig.defconfig +++ b/arch/arm/soc/ti_lm3s6965/Kconfig.defconfig @@ -74,9 +74,6 @@ endif endif # UART_STELLARIS -config UART_CONSOLE_ON_DEV_NAME - default "UART_0" if UART_CONSOLE - config BLUETOOTH_UART_ON_DEV_NAME default "UART_1" if BLUETOOTH_UART diff --git a/arch/x86/soc/atom/Kconfig.defconfig b/arch/x86/soc/atom/Kconfig.defconfig index d6f9ef621da..37bdd680902 100644 --- a/arch/x86/soc/atom/Kconfig.defconfig +++ b/arch/x86/soc/atom/Kconfig.defconfig @@ -80,13 +80,6 @@ endif # UART_NS16550_PORT_1 endif # UART_NS16550 -if UART_CONSOLE - -config UART_CONSOLE_ON_DEV_NAME - default "UART_0" - -endif - if BLUETOOTH_UART config BLUETOOTH_UART_ON_DEV_NAME diff --git a/arch/x86/soc/ia32/Kconfig.defconfig b/arch/x86/soc/ia32/Kconfig.defconfig index 54aec439647..4845ed55def 100644 --- a/arch/x86/soc/ia32/Kconfig.defconfig +++ b/arch/x86/soc/ia32/Kconfig.defconfig @@ -80,13 +80,6 @@ endif # UART_NS16550_PORT_1 endif # UART_NS16550 -if UART_CONSOLE - -config UART_CONSOLE_ON_DEV_NAME - default "UART_0" - -endif - if BLUETOOTH_UART config BLUETOOTH_UART_ON_DEV_NAME diff --git a/arch/x86/soc/quark_d2000/Kconfig.defconfig b/arch/x86/soc/quark_d2000/Kconfig.defconfig index d1dbae77d70..ff063e583d5 100644 --- a/arch/x86/soc/quark_d2000/Kconfig.defconfig +++ b/arch/x86/soc/quark_d2000/Kconfig.defconfig @@ -110,13 +110,6 @@ config UART_QMSI_1_IRQ_PRI default 0 endif # UART_QMSI -if UART_CONSOLE - -config UART_CONSOLE_ON_DEV_NAME - default "UART_0" - -endif - if BLUETOOTH_UART config BLUETOOTH_UART_ON_DEV_NAME