michaelh/zephyr
1
0
Fork 0
Code Releases Activity

define UART_CONSOLE_INDEX using Kconfig

Browse source 
Use Kconfig to define this variable and remove its
previous definitions from board.h. This will simplify
creation of different variants from a single platform.

Change-Id: I0aaa5aa81dedf096c6d8c1ea2d509c71817336d3
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2015-06-26 12:14:02 -04:00
commit 8d879a5c32
23 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arc/defconfig
View file

@ -80,6 +80,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
#
# CONFIG_UART_SIMPLE is not set
# CONFIG_CONSOLE_HANDLER is not set
CONFIG_UART_CONSOLE_INDEX=0
#
# Serial Drivers

1
arch/arm/configs/micro_fsl_frdm_k64f_defconfig
View file

@ -121,6 +121,7 @@ CONFIG_WDOG_INIT=y
#
# CONFIG_UART_SIMPLE is not set
# CONFIG_CONSOLE_HANDLER is not set
CONFIG_UART_CONSOLE_INDEX=0
#
# Serial Drivers

1
arch/arm/configs/micro_ti_lm3s6965_defconfig
View file

@ -121,6 +121,7 @@ CONFIG_BSP_TI_LM3S6965_QEMU=y
#
# CONFIG_UART_SIMPLE is not set
# CONFIG_CONSOLE_HANDLER is not set
CONFIG_UART_CONSOLE_INDEX=0
#
# Serial Drivers

1
arch/arm/configs/nano_fsl_frdm_k64f_defconfig
View file

@ -100,6 +100,7 @@ CONFIG_WDOG_INIT=y
#
# CONFIG_UART_SIMPLE is not set
# CONFIG_CONSOLE_HANDLER is not set
CONFIG_UART_CONSOLE_INDEX=0
#
# Serial Drivers

1
arch/arm/configs/nano_ti_lm3s6965_defconfig
View file

@ -100,6 +100,7 @@ CONFIG_BSP_TI_LM3S6965_QEMU=y
#
# CONFIG_UART_SIMPLE is not set
# CONFIG_CONSOLE_HANDLER is not set
CONFIG_UART_CONSOLE_INDEX=0
#
# Serial Drivers

1
arch/arm/defconfig
View file

@ -121,6 +121,7 @@ CONFIG_WDOG_INIT=y
#
# CONFIG_UART_SIMPLE is not set
# CONFIG_CONSOLE_HANDLER is not set
CONFIG_UART_CONSOLE_INDEX=0
#
# Serial Drivers

1
arch/arm/fsl_frdm_k64f/board.h
View file

@ -213,7 +213,6 @@ This header file is used to specify and describe board-level aspects for the
/* Uart console settings */
#define CONFIG_UART_CONSOLE_INDEX 0
#define CONFIG_UART_CONSOLE_PORT PCR_PORT_B
#define CONFIG_UART_CONSOLE_PORT_RX_PIN 16
#define CONFIG_UART_CONSOLE_PORT_TX_PIN 17

1
arch/arm/ti_lm3s6965/board.h
View file

@ -136,7 +136,6 @@ the 'ti_lm3s6965' BSP.
/* Uart console configuration */
#define CONFIG_UART_CONSOLE_INDEX 0
#define CONFIG_UART_CONSOLE_BAUDRATE 115200
#define CONFIG_UART_CONSOLE_IRQ IRQ_UART0
#define CONFIG_UART_CONSOLE_INT_PRI 3

1
arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
View file

@ -141,6 +141,7 @@ CONFIG_SHUTOFF_PIC=y
# CONFIG_PCI is not set
CONFIG_PLATFORM="generic_pc"
CONFIG_LOAPIC_TIMER_FREQ=150000000
CONFIG_UART_CONSOLE_INDEX=0
#
# Device Drivers

1
arch/x86/configs/micro_generic_pc_defconfig
View file

@ -139,6 +139,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
#
# CONFIG_PCI is not set
CONFIG_PLATFORM="generic_pc"
CONFIG_UART_CONSOLE_INDEX=0
#
# Device Drivers

1
arch/x86/configs/micro_generic_pc_minuteia_defconfig
View file

@ -136,6 +136,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
#
# CONFIG_PCI is not set
CONFIG_PLATFORM="generic_pc"
CONFIG_UART_CONSOLE_INDEX=0
#
# Device Drivers

1
arch/x86/configs/micro_generic_pc_pentium4_defconfig
View file

@ -139,6 +139,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
#
# CONFIG_PCI is not set
CONFIG_PLATFORM="generic_pc"
CONFIG_UART_CONSOLE_INDEX=0
#
# Device Drivers

1
arch/x86/configs/micro_quark_defconfig
View file

@ -138,6 +138,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PLATFORM="quark"
CONFIG_UART_CONSOLE_INDEX=1
#
# Device Drivers

1
arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
View file

@ -120,6 +120,7 @@ CONFIG_SHUTOFF_PIC=y
# CONFIG_PCI is not set
CONFIG_PLATFORM="generic_pc"
CONFIG_LOAPIC_TIMER_FREQ=150000000
CONFIG_UART_CONSOLE_INDEX=0
#
# Device Drivers

1
arch/x86/configs/nano_generic_pc_defconfig
View file

@ -118,6 +118,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
#
# CONFIG_PCI is not set
CONFIG_PLATFORM="generic_pc"
CONFIG_UART_CONSOLE_INDEX=0
#
# Device Drivers

1
arch/x86/configs/nano_generic_pc_minuteia_defconfig
View file

@ -115,6 +115,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
#
# CONFIG_PCI is not set
CONFIG_PLATFORM="generic_pc"
CONFIG_UART_CONSOLE_INDEX=0
#
# Device Drivers

1
arch/x86/configs/nano_generic_pc_pentium4_defconfig
View file

@ -118,6 +118,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
#
# CONFIG_PCI is not set
CONFIG_PLATFORM="generic_pc"
CONFIG_UART_CONSOLE_INDEX=0
#
# Device Drivers

1
arch/x86/configs/nano_quark_defconfig
View file

@ -117,6 +117,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PLATFORM="quark"
CONFIG_UART_CONSOLE_INDEX=1
#
# Device Drivers

1
arch/x86/defconfig
View file

@ -138,6 +138,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PLATFORM="quark"
CONFIG_UART_CONSOLE_INDEX=1
#
# Device Drivers

1
arch/x86/generic_pc/board.h
View file

@ -142,7 +142,6 @@ the 'generic_pc' BSP.
}
/* Console definitions */
#define CONFIG_UART_CONSOLE_INDEX 0
#define CONFIG_UART_CONSOLE_IRQ COM1_INT_LVL
#define CONFIG_UART_CONSOLE_INT_PRI COM1_INT_PRI

2
arch/x86/quark/Kconfig
View file

@ -45,3 +45,5 @@ config PHYS_LOAD_ADDR
config SYS_CLOCK_HW_CYCLES_PER_SEC
default 25000000
config UART_CONSOLE_INDEX
default 1

1
arch/x86/quark/board.h
View file

@ -105,7 +105,6 @@ the 'Quark' BSP.
(CONFIG_UART_NUM_SYSTEM_PORTS + CONFIG_UART_NUM_EXTRA_PORTS)
/* Console definitions */
#define CONFIG_UART_CONSOLE_INDEX 1
#define CONFIG_UART_CONSOLE_PCI_IDX COM1_PCI_IDX
/*

6
drivers/console/Kconfig
View file

@ -38,3 +38,9 @@ config CONSOLE_HANDLER
help
This option enables console input handler allowing to write simple
interaction between serial console and the OS.
config UART_CONSOLE_INDEX
int "UART Console Index"
default 0
help
This option specifies index for the console uart port.