diff options
| author | Tom Rini <trini@konsulko.com> | 2018-03-06 19:02:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-16 10:28:52 -0400 |
| commit | 6f6b7cfa89e5aa3b643196a4ccc8b1ba5d6fa7a4 (patch) | |
| tree | b2da03ec76a5c1f3737b201c95de45ebc68d1a58 | |
| parent | 7dc7a38c79d2f3fccda845ce7ec4a623e1d26335 (diff) | |
| download | u-boot-6f6b7cfa89e5aa3b643196a4ccc8b1ba5d6fa7a4.tar.gz u-boot-6f6b7cfa89e5aa3b643196a4ccc8b1ba5d6fa7a4.tar.xz u-boot-6f6b7cfa89e5aa3b643196a4ccc8b1ba5d6fa7a4.zip | |
Convert all of CONFIG_CONS_INDEX to Kconfig
This converts the following to Kconfig:
CONFIG_CONS_INDEX
We have existing entries for this option in a number of places, with
different guards on them. They're also sometimes used for things not
directly inside of the serial driver. First, introduce a new symbol to
guard the use of CONFIG_CONS_INDEX, so that in the case where we don't
need this for the serial driver, but for some other use, we can still do
it. Next, consolidate all of these into the single entry in
drivers/serial/Kconfig. Finally, introduce CONS_INDEX_[023456] so that
we can imply a correct value here to make the defconfig side of this
smaller.
Signed-off-by: Adam Ford <aford173@gmail.com>
[trini: Rework a lot of the logic here, such that I took authorship from
Adam, but kept his S-o-B line]
Signed-off-by: Tom Rini <trini@konsulko.com>
320 files changed, 181 insertions, 281 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2c52ff025a..95553bee9d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -725,6 +725,7 @@ config ARCH_SUNXI select OF_BOARD_SETUP select OF_CONTROL select OF_SEPARATE + select SPECIFY_CONSOLE_INDEX select SPL_STACK_R if SPL select SPL_SYS_MALLOC_SIMPLE if SPL select SYS_NS16550 @@ -914,6 +915,7 @@ config TARGET_HIKEY select DM_SERIAL select OF_CONTROL select PL01X_SERIAL + select SPECIFY_CONSOLE_INDEX help Support for HiKey 96boards platform. It features a HI6220 SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM. diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h index 92b1c5e2d6..5f0164ce49 100644 --- a/arch/arm/include/asm/arch-bcmcygnus/configs.h +++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_NS16550_CLK 100000000 #define CONFIG_SYS_NS16550_CLK_DIV 54 #define CONFIG_SERIAL_MULTI -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 0x18023000 /* Ethernet */ diff --git a/arch/arm/include/asm/arch-bcmnsp/configs.h b/arch/arm/include/asm/arch-bcmnsp/configs.h index 786deaeece..d3f3be326f 100644 --- a/arch/arm/include/asm/arch-bcmnsp/configs.h +++ b/arch/arm/include/asm/arch-bcmnsp/configs.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK 0x03b9aca0 -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 0x18000300 #endif /* __ARCH_CONFIGS_H */ diff --git a/arch/arm/include/asm/arch-lpc32xx/config.h b/arch/arm/include/asm/arch-lpc32xx/config.h index 3b7f6bdb72..988a851832 100644 --- a/arch/arm/include/asm/arch-lpc32xx/config.h +++ b/arch/arm/include/asm/arch-lpc32xx/config.h @@ -27,12 +27,6 @@ #define CONFIG_SYS_NS16550_CLK 13000000 #endif -#if !defined(CONFIG_LPC32XX_HSUART) -#define CONFIG_CONS_INDEX (CONFIG_SYS_LPC32XX_UART - 2) -#else -#define CONFIG_CONS_INDEX CONFIG_SYS_LPC32XX_UART -#endif - #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400, 460800 } diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 62c25c4044..3bb1ecb58d 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -74,6 +74,7 @@ config OMAP54XX config TI814X bool "TI814X SoC" + select SPECIFY_CONSOLE_INDEX help Support for AM335x SOC from Texas Instruments. The AM335x high performance SOC features a Cortex-A8 @@ -81,6 +82,7 @@ config TI814X config TI816X bool "TI816X SoC" + select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMC help @@ -90,6 +92,7 @@ config TI816X config AM43XX bool "AM43XX SoC" + select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMC imply SPL_DM @@ -111,6 +114,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" + select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMC imply SPL_NAND_AM33XX_BCH diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index dc48eefdef..15cc01439a 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -80,6 +80,7 @@ config MACH_SUN5I select ARM_CORTEX_CPU_IS_UP select SUNXI_GEN_SUN4I select SUPPORT_SPL + imply CONS_INDEX_2 if !DM_SERIAL config MACH_SUN6I bool "sun6i (Allwinner A31)" @@ -110,6 +111,7 @@ config MACH_SUN8I_A23 select SUNXI_GEN_SUN6I select SUPPORT_SPL select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT + imply CONS_INDEX_5 if !DM_SERIAL config MACH_SUN8I_A33 bool "sun8i (Allwinner A33)" @@ -120,6 +122,7 @@ config MACH_SUN8I_A33 select SUNXI_GEN_SUN6I select SUPPORT_SPL select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT + imply CONS_INDEX_5 if !DM_SERIAL config MACH_SUN8I_A83T bool "sun8i (Allwinner A83T)" diff --git a/board/birdland/bav335x/Kconfig b/board/birdland/bav335x/Kconfig index 3380ed39b2..40053665aa 100644 --- a/board/birdland/bav335x/Kconfig +++ b/board/birdland/bav335x/Kconfig @@ -12,16 +12,6 @@ config SYS_SOC config SYS_CONFIG_NAME default "bav335x" -config CONS_INDEX - int "UART used for console" - range 1 6 - default 1 - help - The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced - in documentation, etc) available to it. Depending on your specific - board you may want something other than UART0 as for example the IDK - uses UART3 so enter 4 here. - config BAV_VERSION int "BAV335x Version (1=A, 2=B)" range 1 2 diff --git a/board/eets/pdu001/Kconfig b/board/eets/pdu001/Kconfig index 6217a8f99b..f28ba6e7bf 100644 --- a/board/eets/pdu001/Kconfig +++ b/board/eets/pdu001/Kconfig @@ -17,22 +17,6 @@ config SYS_SOC config SYS_CONFIG_NAME default "pdu001" -config CONS_INDEX - int "UART used for console" - range 1 6 - default 4 - help - The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced - in documentation, etc) available to it. The best choice for the - PDU001 is UART3 as it is wired to the header K2; enter 4 here to - use UART3. UART0 is connected to the EIA-485 transceiver. If you - really need to use it, you are advised to remove the transceiver U14 - from the board. UART1 is wired to the backplane and therefore - accessible from there or by the backplane connector K1 of the PDU. - Any other UART then UART3 (enter 4 here), UART1 (enter 2 here) or - UART0 (enter 1 here) are not sensible since they are not wired to - any connector and therefore difficult to access. - choice prompt "State of Run LED" default PDU001_RUN_LED_RED diff --git a/board/hisilicon/hikey/Kconfig b/board/hisilicon/hikey/Kconfig index 9171502a19..f7f1055e17 100644 --- a/board/hisilicon/hikey/Kconfig +++ b/board/hisilicon/hikey/Kconfig @@ -12,11 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "hikey" -config CONS_INDEX - int "UART used for console" - range 1 4 - default 4 - help - The hi6220 SoC has 5 UARTs. For example to use UART0 enter 1 here. - endif diff --git a/board/tcl/sl50/Kconfig b/board/tcl/sl50/Kconfig index d0068d9324..1b3f5cfc61 100644 --- a/board/tcl/sl50/Kconfig +++ b/board/tcl/sl50/Kconfig @@ -12,14 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "am335x_sl50" -config CONS_INDEX - int "UART used for console" - range 1 6 - default 1 - help - The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced - in documentation, etc) available to it. Depending on your specific - board you may want something other than UART0 as for example the IDK - uses UART3 so enter 4 here. - endif diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig index 97374bdc12..b66ca1a579 100644 --- a/board/ti/am335x/Kconfig +++ b/board/ti/am335x/Kconfig @@ -12,16 +12,6 @@ config SYS_SOC config SYS_CONFIG_NAME default "am335x_evm" -config CONS_INDEX - int "UART used for console" - range 1 6 - default 1 - help - The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced - in documentation, etc) available to it. Depending on your specific - board you may want something other than UART0 as for example the IDK - uses UART3 so enter 4 here. - config NOR bool "Support for NOR flash" help diff --git a/board/ti/am57xx/Kconfig b/board/ti/am57xx/Kconfig index cead0f4f04..0c56682015 100644 --- a/board/ti/am57xx/Kconfig +++ b/board/ti/am57xx/Kconfig @@ -9,15 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "am57xx_evm" -config CONS_INDEX - int "UART used for console" - range 1 6 - default 3 - help - The AM57x (and DRA7xx) SoC has a total of 6 UARTs available to it. - Depending on your specific board you may want something other than UART3 - here. - source "board/ti/common/Kconfig" endif diff --git a/board/ti/dra7xx/Kconfig b/board/ti/dra7xx/Kconfig index b642113b83..f6a8e07c5b 100644 --- a/board/ti/dra7xx/Kconfig +++ b/board/ti/dra7xx/Kconfig @@ -9,15 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "dra7xx_evm" -config CONS_INDEX - int "UART used for console" - range 1 6 - default 1 - help - The DRA7xx (and AM57x) SoC has a total of 6 UARTs available to it. - Depending on your specific board you may want something other than UART1 - here. - source "board/ti/common/Kconfig" endif diff --git a/board/vscom/baltos/Kconfig b/board/vscom/baltos/Kconfig index bc1edcf3a4..b721ed19d8 100644 --- a/board/vscom/baltos/Kconfig +++ b/board/vscom/baltos/Kconfig @@ -12,13 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "baltos" -config CONS_INDEX - int "UART used for console" - range 1 6 - default 1 - help - The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced - in documentation, etc) available to it. Depending on your specific - board you may want something other than UART0. - endif diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig index a06762a3c1..3014352c1f 100644 --- a/configs/A10s-OLinuXino-M_defconfig +++ b/configs/A10s-OLinuXino-M_defconfig @@ -16,5 +16,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SUN4I_EMAC=y CONFIG_AXP152_POWER=y +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig index 22c7026401..02dfda7b7d 100644 --- a/configs/A13-OLinuXinoM_defconfig +++ b/configs/A13-OLinuXinoM_defconfig @@ -18,5 +18,6 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SUNXI_NO_PMIC=y +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 4532d796a7..dc8f166fb0 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DFU_RAM=y CONFIG_AXP_ALDO3_VOLT=3300 +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/A33-OLinuXino_defconfig b/configs/A33-OLinuXino_defconfig index 9bf9e13311..7159a46ce0 100644 --- a/configs/A33-OLinuXino_defconfig +++ b/configs/A33-OLinuXino_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -CONFIG_CONS_INDEX=1 CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=15291 diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig index 2a12595731..c855d85c0c 100644 --- a/configs/Ampe_A76_defconfig +++ b/configs/Ampe_A76_defconfig @@ -20,5 +20,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_CONS_INDEX=2 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/Auxtek-T003_defconfig b/configs/Auxtek-T003_defconfig index 8fa46ba4bc..0431180f55 100644 --- a/configs/Auxtek-T003_defconfig +++ b/configs/Auxtek-T003_defconfig @@ -14,5 +14,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP152_POWER=y +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig index b2658572df..277a6ff57e 100644 --- a/configs/Auxtek-T004_defconfig +++ b/configs/Auxtek-T004_defconfig @@ -12,5 +12,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP152_POWER=y +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/Bananapi_m2m_defconfig b/configs/Bananapi_m2m_defconfig index 9fc1c94212..86027d27eb 100644 --- a/configs/Bananapi_m2m_defconfig +++ b/configs/Bananapi_m2m_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -CONFIG_CONS_INDEX=1 CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=600 CONFIG_DRAM_ZQ=15291 diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig index 0a79219bf6..43f19362f4 100644 --- a/configs/CHIP_defconfig +++ b/configs/CHIP_defconfig @@ -16,6 +16,7 @@ CONFIG_DFU_RAM=y # CONFIG_MMC is not set CONFIG_AXP_ALDO3_VOLT=3300 CONFIG_AXP_ALDO4_VOLT=3300 +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig index 5adc8b5ad8..60dcaa76db 100644 --- a/configs/CHIP_pro_defconfig +++ b/configs/CHIP_pro_defconfig @@ -19,6 +19,7 @@ CONFIG_NAND=y CONFIG_NAND_SUNXI=y CONFIG_AXP_ALDO3_VOLT=3300 CONFIG_AXP_ALDO4_VOLT=3300 +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/Empire_electronix_d709_defconfig b/configs/Empire_electronix_d709_defconfig index aafdb84d7e..7420e108fd 100644 --- a/configs/Empire_electronix_d709_defconfig +++ b/configs/Empire_electronix_d709_defconfig @@ -21,5 +21,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_CONS_INDEX=2 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/Empire_electronix_m712_defconfig b/configs/Empire_electronix_m712_defconfig index 0cda5abd6f..f636bbb9d6 100644 --- a/configs/Empire_electronix_m712_defconfig +++ b/configs/Empire_electronix_m712_defconfig @@ -20,5 +20,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_CONS_INDEX=2 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/MPC8541CDS_defconfig b/configs/MPC8541CDS_defconfig index 155c5d8033..396c4621b7 100644 --- a/configs/MPC8541CDS_defconfig +++ b/configs/MPC8541CDS_defconfig @@ -21,5 +21,6 @@ CONFIG_BOOTP_HOSTNAME=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8541CDS_legacy_defconfig b/configs/MPC8541CDS_legacy_defconfig index 7f609beb58..18d1008ad0 100644 --- a/configs/MPC8541CDS_legacy_defconfig +++ b/configs/MPC8541CDS_legacy_defconfig @@ -22,5 +22,6 @@ CONFIG_BOOTP_HOSTNAME=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig index 24a5251485..776ef52b0a 100644 --- a/configs/MPC8548CDS_36BIT_defconfig +++ b/configs/MPC8548CDS_36BIT_defconfig @@ -24,5 +24,6 @@ CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_E1000=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig index 287639f44d..c3564592e7 100644 --- a/configs/MPC8548CDS_defconfig +++ b/configs/MPC8548CDS_defconfig @@ -23,5 +23,6 @@ CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_E1000=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig index 9403d47811..cca739674a 100644 --- a/configs/MPC8548CDS_legacy_defconfig +++ b/configs/MPC8548CDS_legacy_defconfig @@ -23,5 +23,6 @@ CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_E1000=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8555CDS_defconfig b/configs/MPC8555CDS_defconfig index ce7fa65e54..608d28bd8f 100644 --- a/configs/MPC8555CDS_defconfig +++ b/configs/MPC8555CDS_defconfig @@ -21,5 +21,6 @@ CONFIG_BOOTP_HOSTNAME=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8555CDS_legacy_defconfig b/configs/MPC8555CDS_legacy_defconfig index a4b964ef9f..d95fdcb1ef 100644 --- a/configs/MPC8555CDS_legacy_defconfig +++ b/configs/MPC8555CDS_legacy_defconfig @@ -22,5 +22,6 @@ CONFIG_BOOTP_HOSTNAME=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig index 6eb6c26706..31d38afe21 100644 --- a/configs/Nintendo_NES_Classic_Edition_defconfig +++ b/configs/Nintendo_NES_Classic_Edition_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL=y # CONFIG_MMC is not set CONFIG_AXP_DLDO1_VOLT=3300 CONFIG_AXP_ELDO2_VOLT=1800 +CONFIG_CONS_INDEX=5 CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_FUNCTION_MASS_STORAGE=y diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index c77fe3cc60..c9df23547d 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -CONFIG_CONS_INDEX=1 CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=15291 diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig index ffe806aa62..bbb9e2c5da 100644 --- a/configs/UTOO_P66_defconfig +++ b/configs/UTOO_P66_defconfig @@ -26,5 +26,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_CONS_INDEX=2 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/Wobo_i5_defconfig b/configs/Wobo_i5_defconfig index 12e32ff557..b03ceb63e6 100644 --- a/configs/Wobo_i5_defconfig +++ b/configs/Wobo_i5_defconfig @@ -14,5 +14,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_ALDO3_VOLT=3300 CONFIG_AXP_ALDO4_VOLT=3300 +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig index 58d7676fa9..cb75ec0ad8 100644 --- a/configs/am335x_pdu001_defconfig +++ b/configs/am335x_pdu001_defconfig @@ -47,6 +47,7 @@ CONFIG_DM_REGULATOR=y CONFIG_SPL_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_TPS65910=y +CONFIG_CONS_INDEX=4 CONFIG_SYS_NS16550=y # CONFIG_USE_TINY_PRINTF is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 9d092ef048..a4659f123d 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -27,6 +27,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HCD=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 4f9b161cf4..8b4e7ea163 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -35,6 +35,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig index ea4e18ee3d..5ba086a6c6 100644 --- a/configs/apx4devkit_defconfig +++ b/configs/apx4devkit_defconfig @@ -31,6 +31,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y CONFIG_NAND=y CONFIG_NAND_MXS=y +CONFIG_CONS_INDEX=0 CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/bcm911360_entphn-ns_defconfig b/configs/bcm911360_entphn-ns_defconfig index 948ac1c80a..4bf8a29414 100644 --- a/configs/bcm911360_entphn-ns_defconfig +++ b/configs/bcm911360_entphn-ns_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_FAT=y # CONFIG_MMC is not set +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SHA1=y CONFIG_SHA256=y diff --git a/configs/bcm911360_entphn_defconfig b/configs/bcm911360_entphn_defconfig index 60e9ad6df5..7608d37178 100644 --- a/configs/bcm911360_entphn_defconfig +++ b/configs/bcm911360_entphn_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_FAT=y # CONFIG_MMC is not set +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SHA1=y CONFIG_SHA256=y diff --git a/configs/bcm911360k_defconfig b/configs/bcm911360k_defconfig index d44555f4a7..ac03934d77 100644 --- a/configs/bcm911360k_defconfig +++ b/configs/bcm911360k_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_FAT=y # CONFIG_MMC is not set +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SHA1=y CONFIG_SHA256=y diff --git a/configs/bcm958300k-ns_defconfig b/configs/bcm958300k-ns_defconfig index 1e78d034f7..7af8104bba 100644 --- a/configs/bcm958300k-ns_defconfig +++ b/configs/bcm958300k-ns_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_FAT=y # CONFIG_MMC is not set +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SHA1=y CONFIG_SHA256=y diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig index d44555f4a7..ac03934d77 100644 --- a/configs/bcm958300k_defconfig +++ b/configs/bcm958300k_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_FAT=y # CONFIG_MMC is not set +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SHA1=y CONFIG_SHA256=y diff --git a/configs/bcm958305k_defconfig b/configs/bcm958305k_defconfig index d44555f4a7..ac03934d77 100644 --- a/configs/bcm958305k_defconfig +++ b/configs/bcm958305k_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_FAT=y # CONFIG_MMC is not set +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SHA1=y CONFIG_SHA256=y diff --git a/configs/bcm958712k_defconfig b/configs/bcm958712k_defconfig index 48c772e3b8..b69ba5d477 100644 --- a/configs/bcm958712k_defconfig +++ b/configs/bcm958712k_defconfig @@ -6,5 +6,6 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SYS_PROMPT="u-boot> " +CONFIG_CONS_INDEX=4 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index 797d113e8f..29dc6bddbc 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -33,5 +33,6 @@ CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CONS_INDEX=0 CONFIG_MXS_SPI=y CONFIG_OF_LIBFDT=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 70540fb50d..827ac33426 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index 641c9b645f..390432144f 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -43,6 +43,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index 3224c9d48e..97ed53249a 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -44,6 +44,7 @@ CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2D000000 CONFIG_SMC911X_32_BIT=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index e0e7994365..f278de0c88 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -45,6 +45,7 @@ CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index 07a52f6c5c..2c371281f3 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -31,6 +31,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SCSI_AHCI=y CONFIG_MMC_OMAP_HS=y CONFIG_SCSI=y +CONFIG_CONS_INDEX=4 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig index 7136a4b090..7d3274d09c 100644 --- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig @@ -37,6 +37,7 @@ CONFIG_FSL_SATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_FSL_ESPI=y CONFIG_TPM_AUTH_SESSIONS=y diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig index 6654968dc6..b592c744d9 100644 --- a/configs/controlcenterd_36BIT_SDCARD_defconfig +++ b/configs/controlcenterd_36BIT_SDCARD_defconfig @@ -37,6 +37,7 @@ CONFIG_FSL_SATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_FSL_ESPI=y CONFIG_TPM_AUTH_SESSIONS=y diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig index ef1c5e07ae..259d83a1e8 100644 --- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_TPM=y CONFIG_DOS_PARTITION=y CONFIG_DM=y # CONFIG_PCI is not set +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_TPM_AUTH_SESSIONS=y CONFIG_TPM=y diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig index 879072a58c..f2f9ba9c8d 100644 --- a/configs/controlcenterd_TRAILBLAZER_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_TPM=y CONFIG_DOS_PARTITION=y CONFIG_DM=y # CONFIG_PCI is not set +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_TPM_AUTH_SESSIONS=y CONFIG_TPM=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 7f385d668f..659535979e 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -44,7 +44,6 @@ CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set CONFIG_PHYLIB=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index c670ff4de1..5c68bc9b0b 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -27,5 +27,6 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/difrnce_dit4350_defconfig b/configs/difrnce_dit4350_defconfig index e24c189ee8..0a817769e3 100644 --- a/configs/difrnce_dit4350_defconfig +++ b/configs/difrnce_dit4350_defconfig @@ -20,5 +20,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_CONS_INDEX=2 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 4d67700f4d..a0d9eaee97 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -59,6 +59,5 @@ CONFIG_PHYLIB=y CONFIG_PHY_MARVELL=y CONFIG_NETDEVICES=y CONFIG_FEC_MXC=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_MXC_SPI=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index c968ca0a33..632b32ac61 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -65,7 +65,6 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_FEC_MXC=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_MXC_SPI=y CONFIG_USB=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index a510294093..c5771e65a7 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -28,6 +28,7 @@ CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 38f1624995..25636508f4 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -32,6 +32,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig index d3ada21f70..b0e2622bab 100644 --- a/configs/edb9315a_defconfig +++ b/configs/edb9315a_defconfig @@ -37,5 +37,6 @@ CONFIG_LED_STATUS_GREEN_ENABLE=y CONFIG_LED_STATUS_GREEN=0 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_CONS_INDEX=0 CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig index 6be890aafe..9a5eba4941 100644 --- a/configs/ga10h_v1_1_defconfig +++ b/configs/ga10h_v1_1_defconfig @@ -22,6 +22,7 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_DLDO1_VOLT=3300 +CONFIG_CONS_INDEX=5 CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/gt90h_v4_defconfig b/configs/gt90h_v4_defconfig index 873f95a8c6..1538303462 100644 --- a/configs/gt90h_v4_defconfig +++ b/configs/gt90h_v4_defconfig @@ -21,5 +21,6 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_DLDO1_VOLT=3300 +CONFIG_CONS_INDEX=5 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig index a07b37abd9..c381b00ab0 100644 --- a/configs/h2200_defconfig +++ b/configs/h2200_defconfig @@ -30,6 +30,7 @@ CONFIG_SYS_PROMPT="> " CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set # CONFIG_MMC is not set +CONFIG_CONS_INDEX=3 CONFIG_PXA_SERIAL=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig index 55f83ed1e1..6375034b48 100644 --- a/configs/highbank_defconfig +++ b/configs/highbank_defconfig @@ -20,4 +20,5 @@ CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y CONFIG_SYS_BOOTCOUNT_ADDR=0xfff3cf0c # CONFIG_MMC is not set CONFIG_SCSI=y +CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig index 84d7f371b9..58eb8234df 100644 --- a/configs/hikey_defconfig +++ b/configs/hikey_defconfig @@ -18,6 +18,7 @@ CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" CONFIG_MMC_DW=y CONFIG_MMC_DW_K3=y +CONFIG_CONS_INDEX=4 CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig index 7f2fcf97fd..1f088cc357 100644 --- a/configs/hrcon_defconfig +++ b/configs/hrcon_defconfig @@ -27,5 +27,6 @@ CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig index 210c7f9fdb..e0849616f1 100644 --- a/configs/hrcon_dh_defconfig +++ b/configs/hrcon_dh_defconfig @@ -25,5 +25,6 @@ CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig index 7171c83de3..f901e64c70 100644 --- a/configs/iNet_86VS_defconfig +++ b/configs/iNet_86VS_defconfig @@ -18,5 +18,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_CONS_INDEX=2 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/iNet_D978_rev2_defconfig b/configs/iNet_D978_rev2_defconfig index d406404a31..ddb4d63903 100644 --- a/configs/iNet_D978_rev2_defconfig +++ b/configs/iNet_D978_rev2_defconfig @@ -23,5 +23,6 @@ CONFIG_SPL=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_DLDO1_VOLT=3300 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_CONS_INDEX=5 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index b0daee1a61..0a3dff7796 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -37,6 +37,7 @@ CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 22dbc70615..872766939a 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -38,6 +38,7 @@ CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/inet86dz_defconfig b/configs/inet86dz_defconfig index 2d85a614de..534eb09a35 100644 --- a/configs/inet86dz_defconfig +++ b/configs/inet86dz_defconfig @@ -21,5 +21,6 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_DLDO1_VOLT=3300 +CONFIG_CONS_INDEX=5 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/inet98v_rev2_defconfig b/configs/inet98v_rev2_defconfig index b30859c850..008c357b7a 100644 --- a/configs/inet98v_rev2_defconfig +++ b/configs/inet98v_rev2_defconfig @@ -20,5 +20,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_CONS_INDEX=2 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index ec5fb5ea34..f6f9851bca 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_NFS is not set CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig index 7301eada98..9dadc58757 100644 --- a/configs/ls1021aqds_ddr4_nor_defconfig +++ b/configs/ls1021aqds_ddr4_nor_defconfig @@ -41,6 +41,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig index fb7c456d52..7a4ba2865f 100644 --- a/configs/ls1021aqds_nor_defconfig +++ b/configs/ls1021aqds_nor_defconfig @@ -42,6 +42,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig index 2a2c29142a..4c3dc7368f 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -36,6 +36,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig index 37e1da6aa0..91f67aad06 100644 --- a/configs/ls2080ardb_SECURE_BOOT_defconfig +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig @@ -38,6 +38,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig index de3ce13f96..e1ff501803 100644 --- a/configs/ls2080ardb_defconfig +++ b/configs/ls2080ardb_defconfig @@ -39,6 +39,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index ea0463e8f7..f04e1d3ad0 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -47,6 +47,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/ls2081ardb_defconfig b/configs/ls2081ardb_defconfig index 28fa2002eb..1cd5fec25d 100644 --- a/configs/ls2081ardb_defconfig +++ b/configs/ls2081ardb_defconfig @@ -38,6 +38,7 @@ CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y CONFIG_SCSI=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig index b405a8e2b9..164535137e 100644 --- a/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig @@ -32,6 +32,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/ls2088ardb_qspi_defconfig b/configs/ls2088ardb_qspi_defconfig index 4ea8a5cf79..b0704c333e 100644 --- a/configs/ls2088ardb_qspi_defconfig +++ b/configs/ls2088ardb_qspi_defconfig @@ -36,6 +36,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig index 7c539103d2..1aea6bf45e 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -47,6 +47,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CONS_INDEX=0 CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index f92bbac4d7..3ae825b3e1 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -38,6 +38,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig index 14d21f30d5..aa36957751 100644 --- a/configs/mk802_a10s_defconfig +++ b/configs/mk802_a10s_defconfig @@ -13,5 +13,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP152_POWER=y +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig index ebd95da915..52aeb69861 100644 --- a/configs/mx23_olinuxino_defconfig +++ b/configs/mx23_olinuxino_defconfig @@ -32,6 +32,7 @@ CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_LED_STATUS_CMD=y CONFIG_MMC_MXS=y +CONFIG_CONS_INDEX=0 CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig index ebdc108ebc..cc149a9c4e 100644 --- a/configs/mx23evk_defconfig +++ b/configs/mx23evk_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y # CONFIG_NET is not set CONFIG_MMC_MXS=y +CONFIG_CONS_INDEX=0 CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index aa938a915e..5417d07dd9 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -42,6 +42,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_CONS_INDEX=0 CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 2c590ceba5..6fc81a67b6 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -42,6 +42,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_CONS_INDEX=0 CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index fe8f151c04..bed676ffdd 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -41,6 +41,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_CONS_INDEX=0 CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index ccc4c7a245..4e4ef43a32 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -41,6 +41,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_CONS_INDEX=0 CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 2d28e0aafe..b7793d769b 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y # CONFIG_NET is not set CONFIG_MMC_OMAP_HS=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 35e0b3cd84..1ace7ddbd6 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -57,7 +57,6 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y -CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index e265164ec7..744578e755 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -28,6 +28,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 519b2a0814..b6a3e238e8 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -46,6 +46,7 @@ CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x08000000 CONFIG_SMC911X_32_BIT=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 3e0aec2c0f..894859f680 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -38,6 +38,7 @@ CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index a004f14744..a0c8a36369 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index aa0c36eb95..8e85292e83 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_MMC_OMAP_HS=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index 0c7c80b67b..1c2eb2fa4b 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_SPL_PARTITION_UUIDS=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 7e5fa82cad..e9c61e0402 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -30,6 +30,7 @@ CONFIG_DFU_RAM=y CONFIG_CMD_TCA642X=y CONFIG_MMC_OMAP_HS=y CONFIG_SCSI=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig index b287dbe692..193d2020c9 100644 --- a/configs/parrot_r16_defconfig +++ b/configs/parrot_r16_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_PARTITION_UUIDS is not set +CONFIG_CONS_INDEX=5 CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/polaroid_mid2407pxe03_defconfig b/configs/polaroid_mid2407pxe03_defconfig index 456e9d241b..d785ef600b 100644 --- a/configs/polaroid_mid2407pxe03_defconfig +++ b/configs/polaroid_mid2407pxe03_defconfig @@ -21,5 +21,6 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_DLDO1_VOLT=3300 +CONFIG_CONS_INDEX=5 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/polaroid_mid2809pxe04_defconfig b/configs/polaroid_mid2809pxe04_defconfig index f1e31732a0..d5a93be5a8 100644 --- a/configs/polaroid_mid2809pxe04_defconfig +++ b/configs/polaroid_mid2809pxe04_defconfig @@ -21,5 +21,6 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_DLDO1_VOLT=3300 +CONFIG_CONS_INDEX=5 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/q8_a13_tablet_defconfig b/configs/q8_a13_tablet_defconfig index 9d42468825..ac73a13f48 100644 --- a/configs/q8_a13_tablet_defconfig +++ b/configs/q8_a13_tablet_defconfig @@ -20,5 +20,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_CONS_INDEX=2 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/q8_a23_tablet_800x480_defconfig b/configs/q8_a23_tablet_800x480_defconfig index 6d1f89b4f2..eeab032c52 100644 --- a/configs/q8_a23_tablet_800x480_defconfig +++ b/configs/q8_a23_tablet_800x480_defconfig @@ -21,5 +21,6 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_DLDO1_VOLT=3300 +CONFIG_CONS_INDEX=5 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/q8_a33_tablet_1024x600_defconfig b/configs/q8_a33_tablet_1024x600_defconfig index da6c9e4978..02ee0e4f3c 100644 --- a/configs/q8_a33_tablet_1024x600_defconfig +++ b/configs/q8_a33_tablet_1024x600_defconfig @@ -21,5 +21,6 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_DLDO1_VOLT=3300 +CONFIG_CONS_INDEX=5 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/q8_a33_tablet_800x480_defconfig b/configs/q8_a33_tablet_800x480_defconfig index 21c183b3bb..a7b712bb95 100644 --- a/configs/q8_a33_tablet_800x480_defconfig +++ b/configs/q8_a33_tablet_800x480_defconfig @@ -21,5 +21,6 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP_DLDO1_VOLT=3300 +CONFIG_CONS_INDEX=5 CONFIG_USB_MUSB_HOST=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig index 617a0b5b5b..264f93ba25 100644 --- a/configs/r7-tv-dongle_defconfig +++ b/configs/r7-tv-dongle_defconfig @@ -12,5 +12,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_AXP152_POWER=y +CONFIG_CONS_INDEX=2 CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig index d35798f118..50d182f34a 100644 --- a/configs/sansa_fuze_plus_defconfig +++ b/configs/sansa_fuze_plus_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_MMC_MXS=y +CONFIG_CONS_INDEX=0 CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=y diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig index 8d700d6c80..eebe00815e 100644 --- a/configs/sc_sps_1_defconfig +++ b/configs/sc_sps_1_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=0 CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index 72dea468bf..3664f32abf 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_NFS is not set CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig index a347f1911c..94620a88d1 100644 --- a/configs/spear300_defconfig +++ b/configs/spear300_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig index 0fa4bb6e34..c28633a013 100644 --- a/configs/spear300_nand_defconfig +++ b/configs/spear300_nand_defconfig @@ -24,3 +24,4 @@ CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig index f5ad5fceaf..5dd0ad70d9 100644 --- a/configs/spear300_usbtty_defconfig +++ b/configs/spear300_usbtty_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig index b14008a370..f1a1ec6978 100644 --- a/configs/spear300_usbtty_nand_defconfig +++ b/configs/spear300_usbtty_nand_defconfig @@ -24,3 +24,4 @@ CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig index a6476e7f70..283d729e39 100644 --- a/configs/spear310_defconfig +++ b/configs/spear310_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig index 1389a68544..4737bb5b25 100644 --- a/configs/spear310_nand_defconfig +++ b/configs/spear310_nand_defconfig @@ -24,3 +24,4 @@ CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig index 83ccd5afb4..4a79746934 100644 --- a/configs/spear310_pnor_defconfig +++ b/configs/spear310_pnor_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig index 3313633d07..aa039dae31 100644 --- a/configs/spear310_usbtty_defconfig +++ b/configs/spear310_usbtty_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig index a4be617d6a..071ac55e8d 100644 --- a/configs/spear310_usbtty_nand_defconfig +++ b/configs/spear310_usbtty_nand_defconfig @@ -24,3 +24,4 @@ CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig index 1e1ccc0773..432ed437b7 100644 --- a/configs/spear310_usbtty_pnor_defconfig +++ b/configs/spear310_usbtty_pnor_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig index 33d2bef1d8..001828dc90 100644 --- a/configs/spear320_defconfig +++ b/configs/spear320_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig index ec6cbf0fb5..3667bf8498 100644 --- a/configs/spear320_nand_defconfig +++ b/configs/spear320_nand_defconfig @@ -24,3 +24,4 @@ CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig index a3acdb2abb..2dbd092a2a 100644 --- a/configs/spear320_pnor_defconfig +++ b/configs/spear320_pnor_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig index 4395647c1a..fb1eade03e 100644 --- a/configs/spear320_usbtty_defconfig +++ b/configs/spear320_usbtty_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig index a5fd760783..b39339aec9 100644 --- a/configs/spear320_usbtty_nand_defconfig +++ b/configs/spear320_usbtty_nand_defconfig @@ -24,3 +24,4 @@ CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig index 6aff317046..de995772aa 100644 --- a/configs/spear320_usbtty_pnor_defconfig +++ b/configs/spear320_usbtty_pnor_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig index ac16b40d3b..65693d7355 100644 --- a/configs/spear600_defconfig +++ b/configs/spear600_defconfig @@ -26,3 +26,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear600_nand_defconfig b/configs/spear600_nand_defconfig index e781ba076a..a279ec2af2 100644 --- a/configs/spear600_nand_defconfig +++ b/configs/spear600_nand_defconfig @@ -24,3 +24,4 @@ CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig index c77229a01d..7505ac0fd9 100644 --- a/configs/spear600_usbtty_defconfig +++ b/configs/spear600_usbtty_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig index dbf4d32190..fef9abe19f 100644 --- a/configs/spear600_usbtty_nand_defconfig +++ b/configs/spear600_usbtty_nand_defconfig @@ -24,3 +24,4 @@ CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig index 4c460ef236..f88d808c87 100644 --- a/configs/strider_con_defconfig +++ b/configs/strider_con_defconfig @@ -29,5 +29,6 @@ CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig index b7cd1d8148..129635d782 100644 --- a/configs/strider_con_dp_defconfig +++ b/configs/strider_con_dp_defconfig @@ -29,5 +29,6 @@ CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig index b28e405e16..e0276bd2aa 100644 --- a/configs/strider_cpu_defconfig +++ b/configs/strider_cpu_defconfig @@ -29,5 +29,6 @@ CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig index f250ea3aac..e86ff9b53f 100644 --- a/configs/strider_cpu_dp_defconfig +++ b/configs/strider_cpu_dp_defconfig @@ -29,5 +29,6 @@ CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y +CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/sun8i_a23_evb_defconfig b/configs/sun8i_a23_evb_defconfig index 8a628cf9b1..12def35f24 100644 --- a/configs/sun8i_a23_evb_defconfig +++ b/configs/sun8i_a23_evb_defconfig @@ -13,5 +13,6 @@ CONFIG_SPL=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_CONS_INDEX=5 CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index ad0806098a..4cb9e5d921 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -28,6 +28,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 480b0aa190..f07de51ba8 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -36,6 +36,7 @@ CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_BCH=y CONFIG_PANIC_HANG=y diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index aeedbb28e5..e160a45708 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -35,6 +35,7 @@ CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_BCH=y CONFIG_PANIC_HANG=y diff --git a/configs/ts4600_defconfig b/configs/ts4600_defconfig index fac143909f..79f2370183 100644 --- a/configs/ts4600_defconfig +++ b/configs/ts4600_defconfig @@ -21,4 +21,5 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y +CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig index 23aeabb7b8..685007439c 100644 --- a/configs/vexpress_ca15_tc2_defconfig +++ b/configs/vexpress_ca15_tc2_defconfig @@ -25,4 +25,5 @@ CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x1a000000 CONFIG_SMC911X_32_BIT=y CONFIG_BAUDRATE=38400 +CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig index c66a8a8b90..9ef660eb8b 100644 --- a/configs/vexpress_ca5x2_defconfig +++ b/configs/vexpress_ca5x2_defconfig @@ -24,4 +24,5 @@ CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x1a000000 CONFIG_SMC911X_32_BIT=y CONFIG_BAUDRATE=38400 +CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 063febd543..cd2255248e 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -24,4 +24,5 @@ CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x4e000000 CONFIG_SMC911X_32_BIT=y CONFIG_BAUDRATE=38400 +CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 0aef5b6065..445759ee85 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -48,6 +48,7 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y CONFIG_ETH_DESIGNWARE=y +CONFIG_CONS_INDEX=0 CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig index acdb677b63..aa3236c94b 100644 --- a/configs/xfi3_defconfig +++ b/configs/xfi3_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_MMC_MXS=y +CONFIG_CONS_INDEX=0 CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=y diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index 9f78de3d72..935058a2b8 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y # CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_CONS_INDEX=2 CONFIG_PXA_SERIAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 93e602e0ee..76d5e99647 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -24,6 +24,15 @@ config REQUIRE_SERIAL_CONSOLE during serial port initialization (default y). Set this to n on boards which have no debug serial port whatsoever. +config SPECIFY_CONSOLE_INDEX + bool "Specify the port number used for console" + default y if !DM_SERIAL || (SPL && !SPL_DM_SERIAL) || \ + (TPL && !TPL_DM_SERIAL) + help + In various cases, we need to specify which of the UART devices that + a board or SoC has available are to be used for the console device + in U-Boot. + config SERIAL_PRESENT bool "Provide a serial driver" depends on DM_SERIAL @@ -44,16 +53,39 @@ config SPL_SERIAL_PRESENT This option enables the full UART in SPL, so if is it disabled, the full UART driver will be omitted, thus saving space. +# Logic to allow us to use the imply keyword to set what the default port +# should be. The default is otherwise 1. +config CONS_INDEX_0 + bool + +config CONS_INDEX_2 + bool + +config CONS_INDEX_3 + bool + +config CONS_INDEX_4 + bool + +config CONS_INDEX_5 + bool + +config CONS_INDEX_6 + bool + config CONS_INDEX int "UART used for console" - depends on ARCH_SUNXI - default 2 if MACH_SUN5I - default 5 if MACH_SUN8I_A23 || MACH_SUN8I_A33 + depends on SPECIFY_CONSOLE_INDEX + range 0 6 + default 0 if CONS_INDEX_0 + default 2 if CONS_INDEX_2 + default 3 if CONS_INDEX_3 + default 4 if CONS_INDEX_4 + default 5 if CONS_INDEX_5 + default 6 if CONS_INDEX_6 default 1 help - Configures the console index. - For Allwinner SoC., default values are 2 for SUN5I and 5 for A23/A33. - Otherwise, the index equals 1. + Set this to match the UART number of the serial console. config DM_SERIAL bool "Enable Driver Model for serial drivers" @@ -93,8 +125,8 @@ config SERIAL_SEARCH_ALL config SPL_DM_SERIAL bool "Enable Driver Model for serial drivers in SPL" - depends on DM_SERIAL - default y if SPL && DM_SERIAL + depends on DM_SERIAL && SPL_DM + default y help Enable driver model for serial in SPL. This replaces drivers/serial/serial.c with the serial uclass, which diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index d28e003ba9..d339c1a939 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -441,7 +441,6 @@ unsigned long get_board_ddr_clk(void); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 56e6e149d5..6ad82b8eb1 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -204,7 +204,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc*/ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 96a92f133c..55e73bdc5c 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -370,7 +370,6 @@ combinations. this should be removed later #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc*/ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 125a26ba77..a12ccceca4 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -334,7 +334,6 @@ #endif /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 0f94d4da07..4f5d6703e2 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -297,7 +297,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index a1b5ad6207..21ac664325 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -347,7 +347,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index b0dade59ed..05e631fd07 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -279,7 +279,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (CONFIG_83XX_CLKIN * 2) diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index b00306f1b3..3f0e87fe8a 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -205,7 +205,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 0892000ba5..f92346d216 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -286,7 +286,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index c496b23104..2fa1f7ab75 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -304,7 +304,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 37dcde3759..cb8bce12fa 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -340,7 +340,6 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 182f55843f..0087e1d17c 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -301,7 +301,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 772ce6d4a8..bc466981c5 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -322,7 +322,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 9f0039c549..09a5eaecd6 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -340,7 +340,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index d44de9abdb..a02e20ce68 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -204,7 +204,6 @@ #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 238dd67f0b..27153b7192 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -229,7 +229,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 64e0aa1ca6..917c92e60d 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -175,7 +175,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index cdd70a1d90..5b6373e7df 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -299,7 +299,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index bcef1e71be..28cbdc5211 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -227,7 +227,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 7f854c524f..b76d2e80d7 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -205,7 +205,6 @@ /* Serial Port */ #define CONFIG_CONS_ON_SCC /* define if console on SCC */ #undef CONFIG_CONS_NONE /* define if console on something else */ -#define CONFIG_CONS_INDEX 1 /* which serial channel for console */ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 6d9a964ca7..c27e7a31fe 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -207,7 +207,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index ae92c37fe5..da9370bc11 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -214,7 +214,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 303922a6c3..c1ff6e112f 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -338,7 +338,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index fb5dc9a516..0fc0d11bb0 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -201,7 +201,6 @@ #define CONFIG_SYS_MALLOC_LEN (6 * 1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 954896c1c0..02fdd02282 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -246,7 +246,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 344d99d25e..f6042580fa 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -529,7 +529,6 @@ extern unsigned long get_sdram_size(void); #endif /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 62165dfef7..b4b4d83346 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -338,7 +338,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 8dbfb06343..1328e021e2 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -143,7 +143,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index bf9b1c483f..0b5cde6dcf 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -293,7 +293,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 8001e7002f..cd980bcb12 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -454,7 +454,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index e80ba14bd6..378ed188ed 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -463,7 +463,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index c0a1bb44c5..68805108ac 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -367,7 +367,6 @@ unsigned long get_board_ddr_clk(void); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index a8f7885821..a45bf40f1f 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -473,7 +473,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 50413eb247..14a329f47b 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -419,7 +419,6 @@ unsigned long get_board_ddr_clk(void); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index ca1916afe7..03d933b954 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -367,7 +367,6 @@ unsigned long get_board_ddr_clk(void); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 87d65e4c04..35e96b2156 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -161,7 +161,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index f4d8012b25..98a7c48240 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -151,7 +151,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 499319f7d7..14d786804c 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -274,7 +274,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index f95b1ff6e3..f5a8dec24a 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -73,7 +73,6 @@ */ /* FTUART is a high speed NS 16C550A compatible UART, addr: 0x99600000 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_COM1 CONFIG_FTUART010_02_BASE #ifndef CONFIG_DM_SERIAL diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index fb5fa21c63..6ae6fb4545 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -75,7 +75,6 @@ */ /* FTUART is a high speed NS 16C550A compatible UART, addr: 0x99600000 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_COM1 CONFIG_FTUART010_02_BASE #ifndef CONFIG_DM_SERIAL diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index aba2fc6c3f..826cb45ba7 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -76,7 +76,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_LOADADDR 0x12000000 diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index d5b63e630e..50fd46a589 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -107,7 +107,6 @@ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ -#define CONFIG_CONS_INDEX 1 /* Ethernet support */ #define CONFIG_PHY_SMSC diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index efa4c997ee..6fa117ef23 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CONS_INDEX 1 /* PMIC support */ #define CONFIG_POWER_TPS65217 diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 03b7c265a0..b97a761389 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -58,7 +58,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 on CRANEBOARD */ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 21a79e1662..9e5a7e5270 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -117,7 +117,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ #undef CONFIG_CMD_LOADB diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 1b52cc33a2..e1d4aa6a72 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -155,7 +155,6 @@ * Serial Driver */ #define CONFIG_MXC_UART -#define CONFIG_CONS_INDEX 1 #define CONFIG_MXC_UART_BASE UART1_BASE /* diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 9c23c9b56f..2062e9ac58 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -76,7 +76,6 @@ /* Post pad 3 bytes after each reg addr */ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 13000000 -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 0x3e000000 /* must fit into GPT:u-boot-env partition */ diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index bd6d9aef0a..f15b94c5fc 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -75,7 +75,6 @@ /* Post pad 3 bytes after each reg addr */ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 13000000 -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 0x3e000000 /* must fit into GPT:u-boot-env partition */ diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index 634186a2dc..9c666430f5 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -33,7 +33,6 @@ #define CONFIG_SYS_NS16550_COM2 0x66110000 #define CONFIG_SYS_NS16550_COM3 0x66120000 #define CONFIG_SYS_NS16550_COM4 0x66130000 -#define CONFIG_CONS_INDEX 4 #define CONFIG_BAUDRATE 115200 #define CONFIG_ENV_SIZE SZ_8K diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 364066feb2..d55ef3e897 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 92e0479f0a..5a69f3c4dd 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -9,8 +9,6 @@ #include <configs/ti_am335x_common.h> -#define CONFIG_CONS_INDEX 1 - #ifndef CONFIG_SPL_BUILD # define CONFIG_TIMESTAMP #endif diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index eaf2754285..596e0605e3 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -15,7 +15,6 @@ #define CONSOLEDEV "ttyO2" #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_OMAP_ABE_SYSCK diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index bd41a56641..641bdb71e9 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_AUTOLOAD "no" /* Serial console configuration */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SERIAL1 1 /* UART0 */ /* NS16550 Configuration */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 400edf0bfc..e464e40772 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -62,7 +62,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 19117a0af4..a57715e77c 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -66,7 +66,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 1b057ef8eb..da78519c8e 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -128,8 +128,6 @@ "run emmcboot; " \ "fi;" -#define CONFIG_CONS_INDEX 1 - /* SPL defines. */ #define CONFIG_SPL_TEXT_BASE 0x40300350 #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + (128 << 20)) diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 1351eb85f2..6123cd374d 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -25,7 +25,6 @@ #define OMAP_HSMMC_USE_GPIO /* UART setup */ -#define CONFIG_CONS_INDEX 4 #define CONFIG_SYS_NS16550_COM4 UART4_BASE /* MMC ENV related defines */ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index b810384ce0..72db44dd6b 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -105,7 +105,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ #undef CONFIG_CMD_LOADB diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 276c7333bb..9261eb418b 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -155,7 +155,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 83c2642457..d325bc9201 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -301,7 +301,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index dde0dc3662..c3b5845532 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -186,7 +186,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index a58a54e3ce..dcae282e28 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -126,7 +126,6 @@ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #endif #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SPI #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index abe393e44c..3ee50e23a9 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -91,7 +91,6 @@ /* UART */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 /* USB Configs */ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index d27323a5fb..75353cd112 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART0_BASE /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index 3c4ec171fe..63568caa78 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -16,11 +16,9 @@ #include "tam3517-common.h" /* Our console port is port3 */ -#undef CONFIG_CONS_INDEX #undef CONFIG_SYS_NS16550_COM1 #undef CONFIG_SERIAL1 -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 0d4ec5c101..7eff61645e 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -78,7 +78,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ /* Serial port hardware configuration */ -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, \ 115200, 230400} #define CONFIG_SYS_SERIAL0 0x808C0000 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index b262b379be..6a92e7fde8 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -84,7 +84,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /*Console on UART0 */ #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 067d8369c7..2ce8720b75 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -55,7 +55,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* * Command definition diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index cbfe30d536..8a0ac618e8 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -100,7 +100,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_LOADADDR 0x12000000 diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 4b380beee2..a657db956b 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -100,7 +100,6 @@ * Serial port */ #define CONFIG_FFUART -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 } diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 785cad7762..038ffcd999 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -22,7 +22,6 @@ #define CONFIG_PL011_CLOCK 150000000 #define CONFIG_PL01x_PORTS { (void *)(0xFFF36000) } -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index a8afb15eba..72cded07fd 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -277,7 +277,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index a4acaa65b2..e107109c2d 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -315,7 +315,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index dca910f23c..475461471f 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -82,7 +82,6 @@ */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ /* * Flash & Environment diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 3b5eb4fa6c..e651410b53 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -43,7 +43,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /*********************************************************** * Command definition diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 63aa8dffaf..cf74052d70 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -13,8 +13,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */ -#define CONFIG_CONS_INDEX 0 - #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_MISC_INIT_R /* call misc_init_r during start up */ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index c8e99513f0..28e5d53951 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART0_BASE /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ /* * Flash & Environment diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 061303d993..b7d510e6b0 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -97,7 +97,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 48000000 #define CONFIG_SYS_NS16550_COM3 UART3_BASE -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \ 115200 } diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index f0ec5cf405..f31506238e 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -128,7 +128,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index cc36a68c0b..379224dde4 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -98,8 +98,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /* Console on UART0 */ - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index f49f436120..89e18c514a 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -219,7 +219,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 1d3fd96491..3e5689ac87 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -102,7 +102,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART1_BASE /* Base address of UART1 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 46b3566adf..a58b867c14 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -81,7 +81,6 @@ #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 20c50ff686..88f44ca5fc 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -92,7 +92,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index d1c0acb9cd..5f59f1ea15 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -336,7 +336,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_LPUART #define CONFIG_LPUART_32B_REG #else -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 8f27d9e6c2..5c4da8d900 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -209,7 +209,6 @@ #ifdef CONFIG_LPUART #define CONFIG_LPUART_32B_REG #else -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 4c96186289..687e987d75 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index b5af4b053b..e1ad927f31 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index a3a393e472..211059a601 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -74,7 +74,6 @@ #define CONFIG_SYS_I2C_MXC_I2C4 /* enable I2C bus 4 */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2) diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index edf954dadd..4e6a26cc72 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -84,7 +84,6 @@ #define CONFIG_SYS_I2C_MXC_I2C4 /* enable I2C bus 4 */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 3f9794fc6b..692f64275a 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -10,9 +10,6 @@ #include "ls2080a_common.h" -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 2 - #ifdef CONFIG_FSL_QSPI #ifdef CONFIG_TARGET_LS2081ARDB #define CONFIG_QIXIS_I2C_ACCESS diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index bd36a8d598..171056db54 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -50,7 +50,6 @@ */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_CONS_INDEX 1 /* * MMC Driver diff --git a/include/configs/mcx.h b/include/configs/mcx.h index a624671332..045f602837 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -60,7 +60,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 */ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index dfed513675..87afe3f9bb 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -283,7 +283,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 3035a113c3..62a303c492 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -49,7 +49,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /*Console on UART0 */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200,230400, 460800, 921600 } /* auto boot */ diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 74346cf054..6c603ead91 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -49,7 +49,6 @@ /* Serial Info */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ /* No NOR flash present */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 0fe37c71da..651b998a4a 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -49,7 +49,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */ diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index fe04ca7e1d..899f477ca9 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -63,7 +63,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 0ec28ffc16..23cb64ea46 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -65,7 +65,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* * Command definition diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index e3b33a0a00..8a5b1c4f97 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -79,7 +79,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_ETHPRIME "FEC0" diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 1214ffdc31..43cb97c8cf 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -52,7 +52,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 7965125c86..c3f5f5740a 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -51,7 +51,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 9fa80316a8..8703a61556 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -55,7 +55,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index e1aa7b8aff..dfa1cdffab 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -64,7 +64,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index ed8ac48e01..5b973bb2ff 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -77,7 +77,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 /* Command definition */ diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 8de89c70bc..dadc7b49ef 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -48,7 +48,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 2dc10c6d64..3245f001e8 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -51,7 +51,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Filesystems and image support */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index defb38c5b3..ef76c2f450 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -32,7 +32,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 31b6d3e448..9c58c29489 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -65,7 +65,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_CACHELINE_SIZE 64 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 5d07c9f199..f07f81c841 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -105,7 +105,6 @@ */ #define CONFIG_PL011_CLOCK 24000000 #define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } -#define CONFIG_CONS_INDEX 0 /* Default baudrate can be overridden by board! */ /* FEC Ethernet on SoC */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index c853e8d06f..3cf78d415c 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -73,7 +73,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 on RX-51 */ diff --git a/include/configs/nx25-ae250.h b/include/configs/nx25-ae250.h index a357d7125d..73c3c33ffa 100644 --- a/include/configs/nx25-ae250.h +++ b/include/configs/nx25-ae250.h @@ -64,7 +64,6 @@ /* * Serial console configuration */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 117c0e418a..ff30a8ab6b 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -11,7 +11,6 @@ #define CONFIG_MISC_INIT_R /* Serial setup */ -#define CONFIG_CONS_INDEX 0 #define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index b1f957bd5c..1fa02a5281 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -203,8 +203,6 @@ * are needed and peripheral clocks for UART2 must be enabled in * function per_clocks_enable(). */ -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 2 #ifdef CONFIG_SPL_BUILD #undef CONFIG_SYS_NS16550_COM3 #define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2 diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 36bf51a1c0..048c8307a4 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -35,8 +35,6 @@ #define CONFIG_REVISION_TAG /* Override OMAP3 serial console configuration */ -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 /* NAND */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 7ffc4f7671..c9a154cc80 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -19,8 +19,6 @@ #ifdef CONFIG_SPL_BUILD /* select serial console configuration for SPL */ -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 #endif diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 38a0055297..266dac91a2 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -29,7 +29,6 @@ #include <configs/ti_omap5_common.h> -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 UART3_BASE #define CONFIG_MISC_INIT_R diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index ea7bdf133d..12b266e515 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -108,7 +108,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SPI diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index d0f5529637..a2921fd632 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -554,7 +554,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index e02c31db2a..964d2dbc97 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -191,7 +191,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/p212.h b/include/configs/p212.h index 04773843e4..a087d86a65 100644 --- a/include/configs/p212.h +++ b/include/configs/p212.h @@ -13,7 +13,6 @@ #define CONFIG_MISC_INIT_R /* Serial setup */ -#define CONFIG_CONS_INDEX 0 #define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-p212.dtb\0" diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index c6ff1e1165..411403e8fd 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -98,7 +98,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 -#define CONFIG_CONS_INDEX 1 /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index d9a50cacf2..74bfde7222 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -12,7 +12,6 @@ #define __CONFIG_PENGWYN_H #define CONFIG_SERIAL1 -#define CONFIG_CONS_INDEX 1 #include <configs/ti_am335x_common.h> diff --git a/include/configs/pepper.h b/include/configs/pepper.h index 960afa0b3a..f0ffc518c3 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -72,7 +72,6 @@ "fi;" \ /* Serial console configuration */ -#define CONFIG_CONS_INDEX 1 /* UART0 */ #define CONFIG_SERIAL1 1 #define CONFIG_SYS_NS16550_COM1 0x44e09000 diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 58895a88ba..c133a33b69 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK 115200 #define CONFIG_SYS_NS16550_COM1 0xb40003f8 -#define CONFIG_CONS_INDEX 1 #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 382c5802b9..24ddfe0c79 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK 115200 #define CONFIG_SYS_NS16550_COM1 0xffffffffb40003f8 -#define CONFIG_CONS_INDEX 1 #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index f718704068..ca4b6ec592 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -83,7 +83,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)) diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 5b5689a343..c0b2aa707a 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -259,7 +259,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index e52b3a9d09..5ef452a75d 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -386,7 +386,6 @@ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (400000000 / CONFIG_SYS_CLK_DIV) diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 1d31d3ad3e..44b6da3222 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -232,7 +232,6 @@ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 0e77ccb466..b23e20a563 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_NS16550_COM4 0x481a6000 #define CONFIG_SERIAL1 1 -#define CONFIG_CONS_INDEX 1 /* I2C Configuration */ #define CONFIG_I2C diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 2322326d06..29b5e6ef0c 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -95,7 +95,6 @@ #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \ 115200 } diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6644ef66c1..7833f17cf4 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -192,7 +192,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SYS_NS16550_COM1 SOCFPGA_UART1_ADDRESS #define CONFIG_SYS_NS16550_CLK 50000000 #endif -#define CONFIG_CONS_INDEX 1 /* * USB diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 3491944f93..29e6c685a7 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -174,7 +174,6 @@ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 45e226d7ec..ae6a216a6b 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -76,7 +76,6 @@ * CONFIG_PL01x_PORTS is defined in specific files */ #define CONFIG_PL011_CLOCK (48 * 1000 * 1000) -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, \ 57600, 115200 } diff --git a/include/configs/strider.h b/include/configs/strider.h index 9ba52d1303..f8f4f0f13c 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -278,7 +278,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 0e735bee17..faea33978f 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -121,7 +121,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 02bfca1633..72da301436 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -53,7 +53,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 #define CONFIG_SERIAL1 /* UART1 */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 5a7f207d7f..8038c9f859 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -53,7 +53,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 /* allow to overwrite serial and ethaddr */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index abd0e1862f..18208b1fd9 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -42,8 +42,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ -#define CONFIG_CONS_INDEX 1 - /* Filesystems / image support */ /* MMC */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 3ead2e43c7..cd3db1a0e5 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -43,7 +43,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 1 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 51e1e4e5cf..67b00eb81b 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -35,7 +35,6 @@ /* PL011 Serial Configuration */ #define CONFIG_PL011_CLOCK 24000000 -#define CONFIG_CONS_INDEX 1 /* Generic Interrupt Controller Definitions */ #define GICD_BASE (0x801000000000) diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 61d0b8025d..2f9056cad8 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -122,7 +122,6 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Defines for SPL */ #define CONFIG_SPL_TEXT_BASE 0x40300000 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 35c7a9175b..e4249838ee 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -56,7 +56,6 @@ #define CONFIG_SERIAL1 #define CONFIG_SERIAL2 #define CONFIG_SERIAL3 -#define CONFIG_CONS_INDEX 1 /* * GPMC NAND block. We support 1 device and the physical address to diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 2fe8d9dde0..2592014694 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -66,7 +66,6 @@ #endif #define CONFIG_SYS_NS16550_COM1 KS2_UART0_BASE #define CONFIG_SYS_NS16550_COM2 KS2_UART1_BASE -#define CONFIG_CONS_INDEX 1 #ifndef CONFIG_SOC_K2G #define CONFIG_SYS_NS16550_CLK ks_clk_get_rate(KS2_CLK1_6) diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index cd6a9c2197..3439a27a4c 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -38,7 +38,6 @@ 115200} /* Select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 844a9e55b3..3a871924af 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_COM3 UART3_BASE #endif -#define CONFIG_CONS_INDEX 3 /* TWL6030 */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 80dfe12856..87eb9ac281 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -49,7 +49,6 @@ #define CONFIG_SYS_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ /* select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index d71baab3d6..2fe57e4846 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -67,7 +67,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE /* disable vendor parameters protection (serial#, ethaddr) */ -#define CONFIG_CONS_INDEX 1 /* use UART0 : used by serial driver */ /*********************************************************** * Command definition diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index a5ce52d3cd..1b4140de06 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -52,8 +52,6 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) -#define CONFIG_CONS_INDEX 1 - #define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_SIZE 0x2000 /* #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 836dbb7d55..492aeb4ca3 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -26,7 +26,6 @@ /* UART */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CONS_INDEX 1 /* SD/MMC */ #define CONFIG_FSL_ESDHC diff --git a/include/configs/vct.h b/include/configs/vct.h index 21682795eb..4780c2ca3a 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 #define CONFIG_SYS_NS16550_COM1 UART_1_BASE -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_CLK 921600 /* diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 580a08b0d3..5159568da1 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -234,7 +234,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index d3422a5a2a..208a3156b0 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -105,7 +105,6 @@ #endif /* PL011 Serial Configuration */ -#define CONFIG_CONS_INDEX 0 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO #define CONFIG_PL011_CLOCK 7273800 #else diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 6a10edba81..3e2d410f14 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -134,7 +134,6 @@ #define CONFIG_PL011_CLOCK 24000000 #define CONFIG_PL01x_PORTS {(void *)CONFIG_SYS_SERIAL0, \ (void *)CONFIG_SYS_SERIAL1} -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_SERIAL0 V2M_UART0 diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 6bbf364c0c..ec15a44a9e 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -194,7 +194,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index af06548bee..fa8e9a2a51 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -65,7 +65,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* * Command definition diff --git a/include/configs/x600.h b/include/configs/x600.h index d80db6a914..5b2d0bf536 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -38,7 +38,6 @@ #define CONFIG_PL01x_PORTS { (void *)CONFIG_SYS_SERIAL0, \ (void *)CONFIG_SYS_SERIAL1 } #define CONFIG_PL011_CLOCK (48 * 1000 * 1000) -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, \ 57600, 115200 } #define CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index f5fc24578c..e23b0f2adb 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -43,7 +43,6 @@ #define CONFIG_ARM_DCC #define CONFIG_CPU_ARMV8 -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE \ { 4800, 9600, 19200, 38400, 57600, 115200 } diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index de10d8ce3e..5c8342eee7 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -191,7 +191,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index dfacd2a012..b159d91b07 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -162,7 +162,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index ea4773c445..9f4a9203c0 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -187,7 +187,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 883843aac9..3627aed816 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -188,7 +188,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 691adda332..8a920facca 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -182,7 +182,6 @@ /* Input clk to NS16550 (in Hz; the SYS_CLK_FREQ is in kHz) */ #define CONFIG_SYS_NS16550_CLK CONFIG_SYS_CLK_FREQ -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /*======================*/ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index b5a326befa..0860a500c0 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -43,7 +43,6 @@ * STUART - the lower serial port on Colibri board */ #define CONFIG_STUART 1 -#define CONFIG_CONS_INDEX 2 /* * Bootloader Components Configuration diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 124431b8d1..1dafda3801 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -40,7 +40,6 @@ */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_CONS_INDEX 1 /* use UART2 for console */ /* * Ethernet |