[U-Boot] [PATCHv2 2/2] Convert all of CONFIG_CONS_INDEX to Kconfig
Adam Ford
aford173 at gmail.com
Mon Aug 6 13:22:31 UTC 2018
On Tue, Mar 6, 2018 at 6:02 PM Tom Rini <trini at konsulko.com> wrote:
>
> 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.
>
It looks like there are still some left-over usage of CONFIG_SERIALx
Is it safe for me to go through and remove all these CONFIG_SERIALx
references now that we have CONS_INDEX? If you think so, I'll submit
a patch to remove these and their corresponding whitelist entries.
adam
> Signed-off-by: Adam Ford <aford173 at 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 at konsulko.com>
> ---
> arch/arm/Kconfig | 2 +
> arch/arm/include/asm/arch-bcmcygnus/configs.h | 1 -
> arch/arm/include/asm/arch-bcmnsp/configs.h | 1 -
> arch/arm/include/asm/arch-lpc32xx/config.h | 6 ---
> arch/arm/mach-omap2/Kconfig | 4 ++
> arch/arm/mach-sunxi/Kconfig | 3 ++
> board/birdland/bav335x/Kconfig | 10 -----
> board/eets/pdu001/Kconfig | 16 --------
> board/hisilicon/hikey/Kconfig | 7 ----
> board/tcl/sl50/Kconfig | 10 -----
> board/ti/am335x/Kconfig | 10 -----
> board/ti/am57xx/Kconfig | 9 ----
> board/ti/dra7xx/Kconfig | 9 ----
> board/vscom/baltos/Kconfig | 9 ----
> configs/A10s-OLinuXino-M_defconfig | 1 +
> configs/A13-OLinuXinoM_defconfig | 1 +
> configs/A13-OLinuXino_defconfig | 1 +
> configs/A33-OLinuXino_defconfig | 1 -
> configs/Ampe_A76_defconfig | 1 +
> configs/Auxtek-T003_defconfig | 1 +
> configs/Auxtek-T004_defconfig | 1 +
> configs/Bananapi_m2m_defconfig | 1 -
> configs/CHIP_defconfig | 1 +
> configs/CHIP_pro_defconfig | 1 +
> configs/Empire_electronix_d709_defconfig | 1 +
> configs/Empire_electronix_m712_defconfig | 1 +
> configs/MPC8541CDS_defconfig | 1 +
> configs/MPC8541CDS_legacy_defconfig | 1 +
> configs/MPC8548CDS_36BIT_defconfig | 1 +
> configs/MPC8548CDS_defconfig | 1 +
> configs/MPC8548CDS_legacy_defconfig | 1 +
> configs/MPC8555CDS_defconfig | 1 +
> configs/MPC8555CDS_legacy_defconfig | 1 +
> configs/Nintendo_NES_Classic_Edition_defconfig | 1 +
> configs/Sinlinx_SinA33_defconfig | 1 -
> configs/UTOO_P66_defconfig | 1 +
> configs/Wobo_i5_defconfig | 1 +
> configs/am335x_pdu001_defconfig | 1 +
> configs/am3517_crane_defconfig | 1 +
> configs/am3517_evm_defconfig | 1 +
> configs/apx4devkit_defconfig | 1 +
> configs/bcm911360_entphn-ns_defconfig | 1 +
> configs/bcm911360_entphn_defconfig | 1 +
> configs/bcm911360k_defconfig | 1 +
> configs/bcm958300k-ns_defconfig | 1 +
> configs/bcm958300k_defconfig | 1 +
> configs/bcm958305k_defconfig | 1 +
> configs/bcm958712k_defconfig | 1 +
> configs/bg0900_defconfig | 1 +
> configs/cairo_defconfig | 1 +
> configs/cl-som-am57x_defconfig | 1 +
> configs/cm_t3517_defconfig | 1 +
> configs/cm_t35_defconfig | 1 +
> configs/cm_t54_defconfig | 1 +
> .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 1 +
> configs/controlcenterd_36BIT_SDCARD_defconfig | 1 +
> .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 1 +
> configs/controlcenterd_TRAILBLAZER_defconfig | 1 +
> configs/corvus_defconfig | 1 -
> configs/devkit8000_defconfig | 1 +
> configs/difrnce_dit4350_defconfig | 1 +
> configs/display5_defconfig | 1 -
> configs/display5_factory_defconfig | 1 -
> configs/duovero_defconfig | 1 +
> configs/eco5pk_defconfig | 1 +
> configs/edb9315a_defconfig | 1 +
> configs/ga10h_v1_1_defconfig | 1 +
> configs/gt90h_v4_defconfig | 1 +
> configs/h2200_defconfig | 1 +
> configs/highbank_defconfig | 1 +
> configs/hikey_defconfig | 1 +
> configs/hrcon_defconfig | 1 +
> configs/hrcon_dh_defconfig | 1 +
> configs/iNet_86VS_defconfig | 1 +
> configs/iNet_D978_rev2_defconfig | 1 +
> configs/igep0032_defconfig | 1 +
> configs/igep00x0_defconfig | 1 +
> configs/inet86dz_defconfig | 1 +
> configs/inet98v_rev2_defconfig | 1 +
> configs/kc1_defconfig | 1 +
> configs/ls1021aqds_ddr4_nor_defconfig | 1 +
> configs/ls1021aqds_nor_defconfig | 1 +
> configs/ls1021atwr_nor_defconfig | 1 +
> configs/ls2080ardb_SECURE_BOOT_defconfig | 1 +
> configs/ls2080ardb_defconfig | 1 +
> configs/ls2080ardb_nand_defconfig | 1 +
> configs/ls2081ardb_defconfig | 1 +
> configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 1 +
> configs/ls2088ardb_qspi_defconfig | 1 +
> configs/m28evk_defconfig | 1 +
> configs/mcx_defconfig | 1 +
> configs/mk802_a10s_defconfig | 1 +
> configs/mx23_olinuxino_defconfig | 1 +
> configs/mx23evk_defconfig | 1 +
> configs/mx28evk_auart_console_defconfig | 1 +
> configs/mx28evk_defconfig | 1 +
> configs/mx28evk_nand_defconfig | 1 +
> configs/mx28evk_spi_defconfig | 1 +
> configs/nokia_rx51_defconfig | 1 +
> configs/omap3_beagle_defconfig | 1 +
> configs/omap3_ha_defconfig | 1 +
> configs/omap3_logic_defconfig | 1 +
> configs/omap3_overo_defconfig | 1 +
> configs/omap3_pandora_defconfig | 1 +
> configs/omap4_panda_defconfig | 1 +
> configs/omap4_sdp4430_defconfig | 1 +
> configs/omap5_uevm_defconfig | 1 +
> configs/parrot_r16_defconfig | 1 +
> configs/polaroid_mid2407pxe03_defconfig | 1 +
> configs/polaroid_mid2809pxe04_defconfig | 1 +
> configs/q8_a13_tablet_defconfig | 1 +
> configs/q8_a23_tablet_800x480_defconfig | 1 +
> configs/q8_a33_tablet_1024x600_defconfig | 1 +
> configs/q8_a33_tablet_800x480_defconfig | 1 +
> configs/r7-tv-dongle_defconfig | 1 +
> configs/sansa_fuze_plus_defconfig | 1 +
> configs/sc_sps_1_defconfig | 1 +
> configs/sniper_defconfig | 1 +
> configs/spear300_defconfig | 1 +
> configs/spear300_nand_defconfig | 1 +
> configs/spear300_usbtty_defconfig | 1 +
> configs/spear300_usbtty_nand_defconfig | 1 +
> configs/spear310_defconfig | 1 +
> configs/spear310_nand_defconfig | 1 +
> configs/spear310_pnor_defconfig | 1 +
> configs/spear310_usbtty_defconfig | 1 +
> configs/spear310_usbtty_nand_defconfig | 1 +
> configs/spear310_usbtty_pnor_defconfig | 1 +
> configs/spear320_defconfig | 1 +
> configs/spear320_nand_defconfig | 1 +
> configs/spear320_pnor_defconfig | 1 +
> configs/spear320_usbtty_defconfig | 1 +
> configs/spear320_usbtty_nand_defconfig | 1 +
> configs/spear320_usbtty_pnor_defconfig | 1 +
> configs/spear600_defconfig | 1 +
> configs/spear600_nand_defconfig | 1 +
> configs/spear600_usbtty_defconfig | 1 +
> configs/spear600_usbtty_nand_defconfig | 1 +
> configs/strider_con_defconfig | 1 +
> configs/strider_con_dp_defconfig | 1 +
> configs/strider_cpu_defconfig | 1 +
> configs/strider_cpu_dp_defconfig | 1 +
> configs/sun8i_a23_evb_defconfig | 1 +
> configs/tao3530_defconfig | 1 +
> configs/tricorder_defconfig | 1 +
> configs/tricorder_flash_defconfig | 1 +
> configs/ts4600_defconfig | 1 +
> configs/vexpress_ca15_tc2_defconfig | 1 +
> configs/vexpress_ca5x2_defconfig | 1 +
> configs/vexpress_ca9x4_defconfig | 1 +
> configs/x600_defconfig | 1 +
> configs/xfi3_defconfig | 1 +
> configs/zipitz2_defconfig | 1 +
> drivers/serial/Kconfig | 48 ++++++++++++++++++----
> include/configs/B4860QDS.h | 1 -
> include/configs/BSC9131RDB.h | 1 -
> include/configs/BSC9132QDS.h | 1 -
> include/configs/C29XPCIE.h | 1 -
> include/configs/MPC8308RDB.h | 1 -
> include/configs/MPC8313ERDB.h | 1 -
> include/configs/MPC8315ERDB.h | 1 -
> include/configs/MPC8323ERDB.h | 1 -
> include/configs/MPC832XEMDS.h | 1 -
> include/configs/MPC8349EMDS.h | 1 -
> include/configs/MPC8349ITX.h | 1 -
> include/configs/MPC837XEMDS.h | 1 -
> include/configs/MPC837XERDB.h | 1 -
> include/configs/MPC8536DS.h | 1 -
> include/configs/MPC8540ADS.h | 1 -
> include/configs/MPC8541CDS.h | 1 -
> include/configs/MPC8544DS.h | 1 -
> include/configs/MPC8548CDS.h | 1 -
> include/configs/MPC8555CDS.h | 1 -
> include/configs/MPC8560ADS.h | 1 -
> include/configs/MPC8568MDS.h | 1 -
> include/configs/MPC8569MDS.h | 1 -
> include/configs/MPC8572DS.h | 1 -
> include/configs/MPC8610HPCD.h | 1 -
> include/configs/MPC8641HPCN.h | 1 -
> include/configs/P1010RDB.h | 1 -
> include/configs/P1022DS.h | 1 -
> include/configs/P1023RDB.h | 1 -
> include/configs/P2041RDB.h | 1 -
> include/configs/T102xQDS.h | 1 -
> include/configs/T102xRDB.h | 1 -
> include/configs/T1040QDS.h | 1 -
> include/configs/T104xRDB.h | 1 -
> include/configs/T208xQDS.h | 1 -
> include/configs/T208xRDB.h | 1 -
> include/configs/T4240RDB.h | 1 -
> include/configs/TQM834x.h | 1 -
> include/configs/UCP1020.h | 1 -
> include/configs/adp-ae3xx.h | 1 -
> include/configs/adp-ag101p.h | 1 -
> include/configs/advantech_dms-ba16.h | 1 -
> include/configs/am335x_igep003x.h | 1 -
> include/configs/am335x_shc.h | 1 -
> include/configs/am3517_crane.h | 1 -
> include/configs/apalis_imx6.h | 1 -
> include/configs/apf27.h | 1 -
> include/configs/bcm23550_w1d.h | 1 -
> include/configs/bcm28155_ap.h | 1 -
> include/configs/bcm_northstar2.h | 1 -
> include/configs/calimain.h | 1 -
> include/configs/chiliboard.h | 2 -
> include/configs/cl-som-am57x.h | 1 -
> include/configs/cm_t335.h | 1 -
> include/configs/cm_t35.h | 1 -
> include/configs/cm_t3517.h | 1 -
> include/configs/cm_t43.h | 2 -
> include/configs/cm_t54.h | 1 -
> include/configs/colibri_imx6.h | 1 -
> include/configs/controlcenterd.h | 1 -
> include/configs/corenet_ds.h | 1 -
> include/configs/cyrus.h | 1 -
> include/configs/da850evm.h | 1 -
> include/configs/dh_imx6.h | 1 -
> include/configs/ea20.h | 1 -
> include/configs/eco5pk.h | 2 -
> include/configs/edb93xx.h | 1 -
> include/configs/edminiv2.h | 1 -
> include/configs/flea3.h | 1 -
> include/configs/ge_bx50v3.h | 1 -
> include/configs/h2200.h | 1 -
> include/configs/highbank.h | 1 -
> include/configs/hrcon.h | 1 -
> include/configs/ids8313.h | 1 -
> include/configs/imx27lite-common.h | 1 -
> include/configs/imx31_phycore.h | 1 -
> include/configs/integrator-common.h | 2 -
> include/configs/ipam390.h | 1 -
> include/configs/kc1.h | 1 -
> include/configs/km/km83xx-common.h | 1 -
> include/configs/km/km_arm.h | 2 -
> include/configs/km/kmp204x-common.h | 1 -
> include/configs/legoev3.h | 1 -
> include/configs/ls1012a_common.h | 1 -
> include/configs/ls1021aiot.h | 1 -
> include/configs/ls1021aqds.h | 1 -
> include/configs/ls1021atwr.h | 1 -
> include/configs/ls1043a_common.h | 1 -
> include/configs/ls1046a_common.h | 1 -
> include/configs/ls1088a_common.h | 1 -
> include/configs/ls2080a_common.h | 1 -
> include/configs/ls2080ardb.h | 3 --
> include/configs/m53evk.h | 1 -
> include/configs/mcx.h | 1 -
> include/configs/mpc8308_p1m.h | 1 -
> include/configs/mv-common.h | 1 -
> include/configs/mx25pdk.h | 1 -
> include/configs/mx31ads.h | 1 -
> include/configs/mx31pdk.h | 1 -
> include/configs/mx35pdk.h | 1 -
> include/configs/mx51evk.h | 1 -
> include/configs/mx53ard.h | 1 -
> include/configs/mx53cx9020.h | 1 -
> include/configs/mx53evk.h | 1 -
> include/configs/mx53loco.h | 1 -
> include/configs/mx53ppd.h | 1 -
> include/configs/mx53smd.h | 1 -
> include/configs/mx6_common.h | 1 -
> include/configs/mx7_common.h | 1 -
> include/configs/mx7ulp_evk.h | 1 -
> include/configs/mxs.h | 1 -
> include/configs/nokia_rx51.h | 1 -
> include/configs/nx25-ae250.h | 1 -
> include/configs/odroid-c2.h | 1 -
> include/configs/omap3_cairo.h | 2 -
> include/configs/omap3_evm.h | 2 -
> include/configs/omap3_logic.h | 2 -
> include/configs/omap5_uevm.h | 1 -
> include/configs/omapl138_lcdk.h | 1 -
> include/configs/p1_p2_rdb_pc.h | 1 -
> include/configs/p1_twr.h | 1 -
> include/configs/p212.h | 1 -
> include/configs/pcm051.h | 1 -
> include/configs/pengwyn.h | 1 -
> include/configs/pepper.h | 1 -
> include/configs/qemu-mips.h | 1 -
> include/configs/qemu-mips64.h | 1 -
> include/configs/qemu-ppce500.h | 1 -
> include/configs/sbc8349.h | 1 -
> include/configs/sbc8548.h | 1 -
> include/configs/sbc8641d.h | 1 -
> include/configs/siemens-am33x-common.h | 1 -
> include/configs/sniper.h | 1 -
> include/configs/socfpga_common.h | 1 -
> include/configs/socrates.h | 1 -
> include/configs/spear-common.h | 1 -
> include/configs/strider.h | 1 -
> include/configs/t4qds.h | 1 -
> include/configs/tam3517-common.h | 1 -
> include/configs/tao3530.h | 1 -
> include/configs/tbs2910.h | 2 -
> include/configs/tegra-common.h | 1 -
> include/configs/thunderx_88xx.h | 1 -
> include/configs/ti814x_evm.h | 1 -
> include/configs/ti816x_evm.h | 1 -
> include/configs/ti_armv7_keystone2.h | 1 -
> include/configs/ti_omap3_common.h | 1 -
> include/configs/ti_omap4_common.h | 1 -
> include/configs/tricorder.h | 1 -
> include/configs/ts4800.h | 1 -
> include/configs/uniphier.h | 2 -
> include/configs/usbarmory.h | 1 -
> include/configs/vct.h | 1 -
> include/configs/ve8313.h | 1 -
> include/configs/vexpress_aemv8a.h | 1 -
> include/configs/vexpress_common.h | 1 -
> include/configs/vme8349.h | 1 -
> include/configs/woodburn_common.h | 1 -
> include/configs/x600.h | 1 -
> include/configs/xilinx_zynqmp.h | 1 -
> include/configs/xpedite517x.h | 1 -
> include/configs/xpedite520x.h | 1 -
> include/configs/xpedite537x.h | 1 -
> include/configs/xpedite550x.h | 1 -
> include/configs/xtfpga.h | 1 -
> include/configs/zipitz2.h | 1 -
> include/configs/zmx25.h | 1 -
> 320 files changed, 182 insertions(+), 280 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 2c52ff025a22..95553bee9df3 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 92b1c5e2d671..5f0164ce49c6 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 786deaeece32..d3f3be326f5a 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 3b7f6bdb720f..988a8518329d 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 62c25c404436..3bb1ecb58de0 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 1fededd0a31a..1c36159fb6ab 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 3380ed39b2f2..40053665aabe 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 6217a8f99bee..f28ba6e7bff2 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 9171502a198b..f7f1055e1792 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 d0068d932492..1b3f5cfc6184 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 97374bdc12ae..b66ca1a57982 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 cead0f4f042e..0c5668201589 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 b642113b833a..f6a8e07c5b28 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 bc1edcf3a477..b721ed19d80c 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 cf8e7d524c48..766f7f54d6c8 100644
> --- a/configs/A10s-OLinuXino-M_defconfig
> +++ b/configs/A10s-OLinuXino-M_defconfig
> @@ -17,5 +17,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 f32be685d529..9e6ac149be58 100644
> --- a/configs/A13-OLinuXinoM_defconfig
> +++ b/configs/A13-OLinuXinoM_defconfig
> @@ -19,5 +19,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 d05447425212..d786b3d66c45 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -25,6 +25,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 b926b261bd07..525e4e6e240c 100644
> --- a/configs/A33-OLinuXino_defconfig
> +++ b/configs/A33-OLinuXino_defconfig
> @@ -1,7 +1,6 @@
> CONFIG_ARM=y
> CONFIG_ARCH_SUNXI=y
> CONFIG_SYS_TEXT_BASE=0x4a000000
> -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 ebfc7e04dcc4..b293f1a2c07c 100644
> --- a/configs/Ampe_A76_defconfig
> +++ b/configs/Ampe_A76_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/Auxtek-T003_defconfig b/configs/Auxtek-T003_defconfig
> index aefa98dfd525..a8a015a0c8a0 100644
> --- a/configs/Auxtek-T003_defconfig
> +++ b/configs/Auxtek-T003_defconfig
> @@ -15,5 +15,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 7ddc44d5f719..62e09223d497 100644
> --- a/configs/Auxtek-T004_defconfig
> +++ b/configs/Auxtek-T004_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/Bananapi_m2m_defconfig b/configs/Bananapi_m2m_defconfig
> index 141fccb8b70c..43d717aa5a3f 100644
> --- a/configs/Bananapi_m2m_defconfig
> +++ b/configs/Bananapi_m2m_defconfig
> @@ -1,7 +1,6 @@
> CONFIG_ARM=y
> CONFIG_ARCH_SUNXI=y
> CONFIG_SYS_TEXT_BASE=0x4a000000
> -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 5cd8aa00450f..19c156a45d49 100644
> --- a/configs/CHIP_defconfig
> +++ b/configs/CHIP_defconfig
> @@ -17,6 +17,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 a98bb40c03aa..c5036db17df9 100644
> --- a/configs/CHIP_pro_defconfig
> +++ b/configs/CHIP_pro_defconfig
> @@ -20,6 +20,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 7db66f09b9ff..491931c72402 100644
> --- a/configs/Empire_electronix_d709_defconfig
> +++ b/configs/Empire_electronix_d709_defconfig
> @@ -22,5 +22,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 5f2d55198cb7..5c99391dbc7e 100644
> --- a/configs/Empire_electronix_m712_defconfig
> +++ b/configs/Empire_electronix_m712_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/MPC8541CDS_defconfig b/configs/MPC8541CDS_defconfig
> index 155c5d8033f1..396c4621b76e 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 7f609beb5810..18d1008ad0d1 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 24a52514852f..776ef52b0a2a 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 287639f44db7..c3564592e7a9 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 9403d478113d..cca739674a94 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 ce7fa65e5446..608d28bd8fca 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 a4b964ef9f57..d95fdcb1effc 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 2be724425c43..69d456094e12 100644
> --- a/configs/Nintendo_NES_Classic_Edition_defconfig
> +++ b/configs/Nintendo_NES_Classic_Edition_defconfig
> @@ -17,6 +17,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 b0fe65258479..8782fd3bca73 100644
> --- a/configs/Sinlinx_SinA33_defconfig
> +++ b/configs/Sinlinx_SinA33_defconfig
> @@ -1,7 +1,6 @@
> CONFIG_ARM=y
> CONFIG_ARCH_SUNXI=y
> CONFIG_SYS_TEXT_BASE=0x4a000000
> -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 c0ca8322fe69..9c85c0bd63cb 100644
> --- a/configs/UTOO_P66_defconfig
> +++ b/configs/UTOO_P66_defconfig
> @@ -27,5 +27,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 c2b152beb7f0..376be704d0e8 100644
> --- a/configs/Wobo_i5_defconfig
> +++ b/configs/Wobo_i5_defconfig
> @@ -15,5 +15,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 58d7676fa996..cb75ec0ad8e9 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 b70e54d71408..460ba9af9ad5 100644
> --- a/configs/am3517_crane_defconfig
> +++ b/configs/am3517_crane_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_USB=y
> CONFIG_USB_MUSB_HCD=y
> diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
> index 4f9b161cf48b..8b4e7ea1632e 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 ea4e18ee3da3..5ba086a6c66a 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 948ac1c80a02..4bf8a294146f 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 60e9ad6df535..7608d37178d9 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 d44555f4a7e7..ac03934d776d 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 1e78d034f70b..7af8104bba2a 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 d44555f4a7e7..ac03934d776d 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 d44555f4a7e7..ac03934d776d 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 48c772e3b889..b69ba5d477fd 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 797d113e8f2c..29dc6bddbc38 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 70540fb50d28..827ac3342632 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 641c9b645fab..390432144f01 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 3224c9d48e48..97ed53249a29 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 e0e799436528..f278de0c8843 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 07a52f6c5cc8..2c371281f383 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 7136a4b09052..7d3274d09cc8 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 6654968dc60e..b592c744d9b8 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 ef1c5e07ae9c..259d83a1e872 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 879072a58cb1..f2f9ba9c8d72 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 7f385d668f23..659535979e29 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 c670ff4de14b..5c68bc9b0b23 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 49bb62e04ba3..679e98b31778 100644
> --- a/configs/difrnce_dit4350_defconfig
> +++ b/configs/difrnce_dit4350_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/display5_defconfig b/configs/display5_defconfig
> index 4d67700f4da1..a0d9eaee97b7 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 c968ca0a3301..632b32ac617a 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 a510294093ca..c5771e65a7ad 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 38f162499535..25636508f409 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 d3ada21f70df..b0e2622bab98 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 1d7cc167a96a..c2203a47ded8 100644
> --- a/configs/ga10h_v1_1_defconfig
> +++ b/configs/ga10h_v1_1_defconfig
> @@ -23,6 +23,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 2b94fe2b8791..8c0f5e79cc6f 100644
> --- a/configs/gt90h_v4_defconfig
> +++ b/configs/gt90h_v4_defconfig
> @@ -22,5 +22,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 a07b37abd90f..c381b00ab0e6 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 55f83ed1e17c..6375034b4861 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 84d7f371b9af..58eb8234df2c 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 7f2fcf97fdbe..1f088cc357ce 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 210c7f9fdbcb..e0849616f120 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 d85b04630a37..21b988f91ff8 100644
> --- a/configs/iNet_86VS_defconfig
> +++ b/configs/iNet_86VS_defconfig
> @@ -19,5 +19,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 88e858c6b3ae..ba384cf8598e 100644
> --- a/configs/iNet_D978_rev2_defconfig
> +++ b/configs/iNet_D978_rev2_defconfig
> @@ -24,5 +24,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 b0daee1a619b..0a3dff77968e 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 22dbc7061538..872766939ae6 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 b87dfb93c706..cf6c8f39f9a3 100644
> --- a/configs/inet86dz_defconfig
> +++ b/configs/inet86dz_defconfig
> @@ -22,5 +22,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 1107cb172787..2daaf47ee8c8 100644
> --- a/configs/inet98v_rev2_defconfig
> +++ b/configs/inet98v_rev2_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/kc1_defconfig b/configs/kc1_defconfig
> index ec5fb5ea34b6..f6f9851bca19 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 7301eada98b4..9dadc58757ba 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 fb7c456d522b..7a4ba2865f67 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 2a2c29142a0e..4c3dc7368fb7 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 37e1da6aa049..91f67aad0678 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 de3ce13f96b7..e1ff501803e4 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 ea0463e8f79f..f04e1d3ad003 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 28fa2002eb5c..1cd5fec25d79 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 b405a8e2b99a..164535137e12 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 4ea8a5cf79b6..b0704c333e81 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 7c539103d240..1aea6bf45eae 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 f92bbac4d752..3ae825b3e1af 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 8cd24f2b46b9..7af29df0a2fb 100644
> --- a/configs/mk802_a10s_defconfig
> +++ b/configs/mk802_a10s_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/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig
> index ebd95da91539..52aeb69861e6 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 ebdc108ebcea..cc149a9c4ef1 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 aa938a915e3a..5417d07dd987 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 2c590ceba50e..6fc81a67b680 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 fe8f151c044c..bed676ffdd84 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 ccc4c7a245f3..4e4ef43a32e8 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 2d28e0aafe5b..b7793d769bc1 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 f0169a4544c6..dd538042bd0c 100644
> --- a/configs/omap3_beagle_defconfig
> +++ b/configs/omap3_beagle_defconfig
> @@ -46,6 +46,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_ha_defconfig b/configs/omap3_ha_defconfig
> index e265164ec776..744578e75511 100644
> --- a/configs/omap3_ha_defconf
More information about the U-Boot
mailing list