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>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2c52ff025a2219b7578ceefe3c014705d207a075..95553bee9df3895b68332a43ff9ad35d40bd602b 100644 (file)
--- 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 92b1c5e2d671b54693a32d52716a688e8b9bf14b..5f0164ce49c6d4203d3dc76da9918229fac8c87e 100644 (file)
--- 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 786deaeece3263bfb28c7dca520d9b539bf81c35..d3f3be326f5a0227be2acfb9cba38668b5ca20be 100644 (file)
--- 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 3b7f6bdb720fe867be9f83d8388e3e962a250699..988a8518329d1387132ef5f15cbeb75758d4ce07 100644 (file)
--- 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 62c25c404436fdebfd8ca1fb9d6c7d12e484eff6..3bb1ecb58de0a14db73af27a8a0fe719e23ecd8c 100644 (file)
--- 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 dc48eefdef79e2e26e5ff43b326e7d179ce7cffd..15cc01439ad5483dd129cb2e51a85d44e72de26e 100644 (file)
--- 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 3380ed39b2f24c73b9675ed8d821ec1101ad9831..40053665aabeecf304e2da1db4cb6d1ae43eec3c 100644 (file)
--- 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 6217a8f99bee89557237bab836a4a172f0b80a0b..f28ba6e7bff2455d0ccf9e4ffab29d6e114bddea 100644 (file)
--- 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 9171502a198b132c018d7bb6cebd551d530e27ed..f7f1055e179206d4b71a03c9928fc4d95f9c015c 100644 (file)
--- 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 d0068d932492b147231200502bbc3d535146960e..1b3f5cfc61846002d9864ba118dc393b34c95e57 100644 (file)
--- 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 97374bdc12ae1b07d0038d7f4a35293b8c1751dc..b66ca1a57982b17acd41a5ca395b09de5fe39814 100644 (file)
--- 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 cead0f4f042e2233c2cae6d2ef7ccfb17ac7b452..0c566820158973874e781f645d984d1a17d6b4c5 100644 (file)
--- 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 b642113b833a1dab4adf6e3b8ab3348c517879f0..f6a8e07c5b28c0ad2650c22fdea90b82f0908552 100644 (file)
--- 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 bc1edcf3a4770eff32afbae8a797b5ddb684b265..b721ed19d80cd7aa3a43545b5aa99e57361e355d 100644 (file)
--- 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 a06762a3c1bb40c7706a623799c84e43a740fdcf..3014352c1f2d4e4b56bda127d93b2ef6ed700ca0 100644 (file)
--- 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 22c702640117978fd482195f3568a56e893d9469..02dfda7b7d0fc7fcdfce6513ff1319342f6bffc4 100644 (file)
--- 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 4532d796a75fb40bb2fc0007a5e153bfae6e4bd7..dc8f166fb09062c8d38f278de7515f4eabe2254c 100644 (file)
--- 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 9bf9e13311a076155bd37140739162a72429feba..7159a46ce0329aa1e62cec951baf7ac1bcd522e4 100644 (file)
--- 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 2a12595731ba005754525fb4162370abfacaecf6..c855d85c0c583debb383d9eca5197b283e61574a 100644 (file)
--- 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 8fa46ba4bc4a0aaa27dbfe71931ffeb5a913f266..0431180f55eb91c9c742091f4f378e8a87a24d9a 100644 (file)
--- 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 b2658572dfd64997702194b9b65a8a1a5b8836de..277a6ff57e4c13c9a8f56e67603be770ce1108c3 100644 (file)
--- 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 9fc1c942127f1c8fc548cc88421d1eee819616c7..86027d27eb94495d4bef9d52080950ba221551ce 100644 (file)
--- 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 0a79219bf67569552cc2a9f01ac79f93911289d8..43f19362f4576ce9b9226590419bd694393e178d 100644 (file)
--- 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 5adc8b5ad8416bfcff67434e806b1d8c0ac10146..60dcaa76db10f5f400e645b0b1d9a72143b37d33 100644 (file)
--- 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 aafdb84d7e00386fcde88972865832fa5bf83d32..7420e108fd0979de2e3516022fecffbc50b3ba3f 100644 (file)
--- 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 0cda5abd6f2dfc69512d20131d45fc4e2fbe86e4..f636bbb9d645f16684ad4ae3a05a1ab7d7d0a6c1 100644 (file)
--- 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 155c5d8033f17984dfaeee8a17442f756e1dbb57..396c4621b76e8f3e48dc520428339275de31c4d8 100644 (file)
--- 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 7f609beb5810ad8e1923c66e62ea15f33a2214a6..18d1008ad0d1f5960ab44ba5aaeedbe1b8845697 100644 (file)
--- 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 24a52514852f25c746edaaa7b385acc151ac73ee..776ef52b0a2a290105c010fa046f04b0c48eb9d1 100644 (file)
--- 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 287639f44db70a781a63943c02ac07c613e9ee53..c3564592e7a9fa5d59d6b8023652df5aaaebd773 100644 (file)
--- 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 9403d478113d8a0e8270b6f76bd6e26ac3428935..cca739674a9444c5f99128ac35be74d388ea843c 100644 (file)
--- 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 ce7fa65e5446914ebee436e89869d88319c6f5ab..608d28bd8fcade2ad6d212f9c403e0ed470f9128 100644 (file)
--- 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 a4b964ef9f57c6fc1e928d57e08b449fd7ba84f3..d95fdcb1effc95d76bbb69e92d14044c37ecd9b8 100644 (file)
--- 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 6eb6c26706820e8419ea0ebc8dedbddb5d6b6750..31d38afe212dca56b1811d7dc87ecf6d92e052d5 100644 (file)
--- 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 c77fe3cc60a4306f7beb5272cf806645ba577fd1..c9df23547d08b39479b51063885e1b245f7f730c 100644 (file)
--- 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 ffe806aa62072d6781288ae2b3042c0a94f62d26..bbb9e2c5da2ea3224e3d145a75f372a5efb49811 100644 (file)
--- 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 12e32ff557bfa677a22091a90c9e9e2cf79501aa..b03ceb63e6ef3a35fac118672ec050a7187ca09d 100644 (file)
--- 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 58d7676fa9962345047d492c25c1fb9d7199ae01..cb75ec0ad8e9f1c96dc4960e7e54f15c9db96ed9 100644 (file)
--- 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 9d092ef04871cb5677261be4385940d3e10b2738..a4659f123d5dc0371a05700366d3a3559b7ff841 100644 (file)
--- 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 4f9b161cf48b4a3c7608945e751a17d5ce4eafde..8b4e7ea1632ec8b88aba3949227c3f914074dd6b 100644 (file)
--- 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 ea4e18ee3da3e9107f5dd8e07afa6a80d7e36f9b..5ba086a6c66a38eef17a1b84eab137dc1eee4435 100644 (file)
--- 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 948ac1c80a02370d7947fa8636892463601dab0a..4bf8a294146f58a8b1682193392dc14e9c5f2b35 100644 (file)
--- 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 60e9ad6df5352635ba30e06d3226f1f4be2a035d..7608d37178d9b652aff8902ae82df24b6b2a56e0 100644 (file)
--- 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 d44555f4a7e7df2c2fd77a93938085b474a462fe..ac03934d776d7fd2efbbce33e40b1a4eacde0ac4 100644 (file)
--- 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 1e78d034f70b812ddc136a5d0392ffe39f535e7d..7af8104bba2aefef6e634f8ede96c89021e94e8f 100644 (file)
--- 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 d44555f4a7e7df2c2fd77a93938085b474a462fe..ac03934d776d7fd2efbbce33e40b1a4eacde0ac4 100644 (file)
--- 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 d44555f4a7e7df2c2fd77a93938085b474a462fe..ac03934d776d7fd2efbbce33e40b1a4eacde0ac4 100644 (file)
--- 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 48c772e3b8893b56aac7159886dbd2bdb956f013..b69ba5d477fd6dd30ad9ee4e38ad4da1298a15ed 100644 (file)
--- 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 797d113e8f2c5a7fdce4742553d604fac4a3de10..29dc6bddbc38de146e7e2d3428ff0654055c75ca 100644 (file)
--- 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 70540fb50d285317e1a397550dcc951b4be9d2df..827ac3342632360cd3a8989710e303a1dd6d9f2a 100644 (file)
--- 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 641c9b645fabba36cf554c74afe4e1477691970c..390432144f019957881ebd9e6a3162c6a12f3df2 100644 (file)
--- 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 3224c9d48e48f57bf8b553bc4ac4e9152ccad9a3..97ed53249a29a97fad2f27d6398f212679065a9d 100644 (file)
--- 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 e0e799436528b922fa45e9e11748ff4f86c58477..f278de0c8843e6245c6524e02e8f60b2edc513cd 100644 (file)
--- 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 07a52f6c5cc84b2d9120048cb0b88bd333071bf3..2c371281f3835e0ce6d7dffd2b01069143ab8a9e 100644 (file)
--- 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 7136a4b09052aafa3b97e3b98a67c1b20daf2de8..7d3274d09cc8d09146654bdc923f3b03aa1d6fe4 100644 (file)
--- 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 6654968dc60ed054a27d039ea05f1741de556f32..b592c744d9b8af5b25f334c1689468a2c3991d6f 100644 (file)
--- 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 ef1c5e07ae9c9a3108e58189c38987c85120f4ce..259d83a1e8720359440895db662d4c5e08c896be 100644 (file)
--- 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 879072a58cb13c7a83a85ef09ae22602f5b543fb..f2f9ba9c8d72c03725e0485a93270d7584749951 100644 (file)
--- 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 7f385d668f23a7d3bafcb85518836eda2a293406..659535979e29e6d395ab89614ef0bf57e0e8afae 100644 (file)
--- 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 c670ff4de14beb832edd5f1fe4915e41d3157872..5c68bc9b0b23be538a7bdd8624c8717905975cab 100644 (file)
--- 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 e24c189ee83d047434608470281da4ef9501967b..0a817769e30205d1a730a9fade907f4e7b828c0e 100644 (file)
--- 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 4d67700f4da1afc0b8e510148198d31a5acd8d96..a0d9eaee97b750882471e1f9ca503ec3c8d295c6 100644 (file)
--- 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 c968ca0a3301f6a0292b25f4f8610e47a7e0932e..632b32ac617aea50035ac58da30efd38d1b1eeb3 100644 (file)
--- 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 a510294093cacb56b7255ff4fe409c79f7bdc81c..c5771e65a7adbbbe510ea47321216429a7f48fb5 100644 (file)
--- 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 38f162499535e809334df5a7e85e4574658de272..25636508f409f659ebcba89bdfa6922fd40b6d82 100644 (file)
--- 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 d3ada21f70df3b62bed694e96a535823672d5309..b0e2622bab9880511b1696bff1aa1470c2d08c2f 100644 (file)
--- 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 6be890aafeaea71dc3210e5bdb53cee126ecc83e..9a5eba49418de0dc6fbc60001c793682edff4e08 100644 (file)
--- 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 873f95a8c6e498c18a15d27facd7ac5cb47e64b6..1538303462bec8d6ced199173b309ee304858b8c 100644 (file)
--- 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 a07b37abd90f72c713f31ef407820c86d8289bb4..c381b00ab0e65996e2c5ce0bce0cd8b7de66416a 100644 (file)
--- 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 55f83ed1e17c4eaad5816c18524ed190598e54a9..6375034b4861c02f003b17079edb12a56f504172 100644 (file)
--- 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 84d7f371b9afb8051c3983049fb823584cd9bf89..58eb8234df2c4f71367c8553aa21ff5b167c6f6d 100644 (file)
--- 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 7f2fcf97fdbe3dab5f89f78337e615361e673c7a..1f088cc357ce70b10ad3c1e885ba5e2fc95c5939 100644 (file)
--- 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 210c7f9fdbcb044b70591ed50f871c9973966db1..e0849616f1205ac96e32272d33ff322a859a475a 100644 (file)
--- 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 7171c83de37b5f369fa6c3352a5ecaee888923af..f901e64c70684df0441ed2a9c0deca474483feee 100644 (file)
--- 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 d406404a31bc1fa2bbee48479df58cc9c5c8bd7e..ddb4d63903240e1e496ac94c117e7bb4e92efd2d 100644 (file)
--- 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 b0daee1a619ba1506c389015dfd1ac2029499997..0a3dff77968e5d151267511487f2dcba5559f981 100644 (file)
--- 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 22dbc706153805f0c43686f6c38b0df7167c9ab7..872766939ae6a2261f31b56c805335bd7f29cbcb 100644 (file)
--- 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 2d85a614de99bb512b3b528571a96837239647ee..534eb09a35d2b6fa6dc8ffb36a454a1edd98ca10 100644 (file)
--- 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 b30859c8502fb8a85b95bfdd71313b8a5dc5fc11..008c357b7ab36eb81a696915ac46e9fbeba70945 100644 (file)
--- 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 ec5fb5ea34b6a982fb5b75843a55a421a7ddd582..f6f9851bca19c52146f068f9aa6ced4af9b22f25 100644 (file)
--- 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 7301eada98b42a34f1459c99a7a2996e694c9714..9dadc58757bae46ed686c3f0842cbc17b46df106 100644 (file)
--- 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 fb7c456d522b2b6075a511e1435eb8cc1b28d7e7..7a4ba2865f67fc3faf77d60a83d243a6da12deff 100644 (file)
--- 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 2a2c29142a0e8806603eb2b01ce25b99d140ba7f..4c3dc7368fb78bfaa4b74762ea695c83546884a3 100644 (file)
--- 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 37e1da6aa04942fcf2a2fca5e75f23f43110bb24..91f67aad06785004e9c23e5bf57bef4e7cc554ba 100644 (file)
--- 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 de3ce13f96b7d8fd30c96e3c1fed382a972308ed..e1ff501803e4ce02ddfa3aaa0a6792e9b8d762f4 100644 (file)
--- 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 ea0463e8f79f677449197a262f80d179dde5110c..f04e1d3ad0039dc62d24f96181f220df6a39b895 100644 (file)
--- 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 28fa2002eb5c9818925de3dd5a9ba64e624872ee..1cd5fec25d795ad0931f244d865ce81195fef274 100644 (file)
--- 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 b405a8e2b99a59e6a2029377b11cc96769d13732..164535137e127a4e662cff534e6fc96d1accfbbb 100644 (file)
--- 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 4ea8a5cf79b62855a2bd900fc5bab504cffb12e0..b0704c333e81570dece80ee3c07d8f7fbb7359cb 100644 (file)
--- 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 7c539103d2407e21d7995b0c7f9d382afd52ea6d..1aea6bf45eae6cc03d52ac4baed035fe68b01874 100644 (file)
--- 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 f92bbac4d7527b1a71976f8483bbf799740d66bf..3ae825b3e1af57fe06b7410ac9dd68da8769b45a 100644 (file)
--- 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 14d21f30d5cf9a0cbf8ae802bff5441c46a70b1b..aa36957751a2aee1addcbfaa2f55a1798029698c 100644 (file)
--- 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 ebd95da915393649c11a7d04065636a95af5324c..52aeb69861e614dad29eaaece15c1ae07fd4ee2d 100644 (file)
--- 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 ebdc108ebcea2bb0c05493aa14803d9af6b06d9a..cc149a9c4ef17c9b5f4272e7252e2ce1c24bf64b 100644 (file)
--- 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 aa938a915e3a363644e1d66c8c5867cfaba3cd3b..5417d07dd987a0cb4d6bea51040176f723fa257c 100644 (file)
--- 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 2c590ceba50e5a35f3d4c9ba1cbb3b32f83ff41e..6fc81a67b680b93c596cdb50ad3ada10d232796a 100644 (file)
--- 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 fe8f151c044cb805a45824c074c167232a095bb4..bed676ffdd84b0f12c25ee5e99a23dba16fda9f5 100644 (file)
--- 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 ccc4c7a245f3863cfcf1fff3aa29d945d771213a..4e4ef43a32e832e9f258a12eaaa06675ff7341d2 100644 (file)
--- 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 2d28e0aafe5bfa28d9e0d3f2c9917e2e5397ae37..b7793d769bc13473e95ac2ec15c41a5ecf4bc7c0 100644 (file)
--- 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 35e0b3cd84137ea9adfd2000086fa1869d3ad63b..1ace7ddbd670c5414157a1267e6f852d6aabef4f 100644 (file)
--- 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 e265164ec776f01240331244ab5b70b49ac11406..744578e75511c9bcf493ad26cc300b61b5fdf8ac 100644 (file)
--- 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 519b2a08147f374d300e287095f86d75855f9116..b6a3e238e8e1714235da1191965bfa5ae8edaf52 100644 (file)
--- 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 3e0aec2c0f1ae80ef84b380c103449c40677c2d4..894859f680596a1e59ab269c2c391b608ba7e07e 100644 (file)
--- 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 a004f147441b8a2c6c946194e86a05444aad46f7..a0c8a3636940ebf1ac1036857136aa5d0081a999 100644 (file)
--- 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 aa0c36eb95ae5a7af8b9157731249fc43cad46a4..8e85292e83a580bc1ac04684f9165412f6595db0 100644 (file)
--- 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 0c7c80b67bc8bfaf5f9c9484bbcab45234a636a4..1c2eb2fa4b5006f4dc409f0c6cf08890a0c9dd16 100644 (file)
--- 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 7e5fa82cad9f653af4a66fa4950e9f8d6eb6fb87..e9c61e0402f2c94817b3a3f2ac6ffdb72bdd5723 100644 (file)
--- 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 b287dbe692b713de3e28c55c55bb32fa1a02ea6c..193d2020c9068ec5955f11700c162f202af211ad 100644 (file)
--- 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 456e9d241be4eb463d7092056fc237df5f1759ff..d785ef600b92a193fa4bee6423b99e887e80f8f6 100644 (file)
--- 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 f1e31732a0563b893924cbff9c1e36f150c70dae..d5a93be5a80e6ac677f51f2d43797320da1573e4 100644 (file)
--- 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 9d424688256b36e03617e7985e32e2bc10ee0592..ac73a13f488fbb1476c43ca4f550bfcda02f36ba 100644 (file)
--- 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 6d1f89b4f26d3c028332fb2f57b8846155bff16e..eeab032c527f82e61808edcac9dcf0040d97b76d 100644 (file)
--- 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 da6c9e4978f14f6aa9c4478ebf656c09e50974a0..02ee0e4f3cdc972df69f55695a92eb91bda03039 100644 (file)
--- 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 21c183b3bbbec09adc54a9fe245392bca0b67146..a7b712bb956109c092b54458c067152334cca32b 100644 (file)
--- 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 617a0b5b5bb07ba9fa299eb8d6ce2fb3a92c551e..264f93ba25a6e3bf52c87ebd224daee965ee26d4 100644 (file)
--- 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 d35798f1186b39f10f50c62d8edd1b50734be79a..50d182f34aba4b662b2e54e0c5db52c2f05611b5 100644 (file)
--- 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 8d700d6c8077a5416a09a470a9a669e625316b46..eebe00815ee9c773aec1485a830edcfc7bbe27f9 100644 (file)
--- 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 72dea468bf2c37c0372b6b402a9932405f0294d3..3664f32abf4a9094b60b0bfb6f3da5dde0c4a613 100644 (file)
--- 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 a347f1911c209aae1fa38e2f359c0e8a700da006..94620a88d12323952675d9a990242572131fa76f 100644 (file)
--- 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 0fa4bb6e34dad271174b0a2d6e957ac3474be05a..c28633a013327cea48a69f97bc8d6a3bce4c7c96 100644 (file)
--- 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 f5ad5fceafa2abadf8e4d2536bd6fb42337a6d56..5dd0ad70d93fc370d74d1873aa2529577efce2fa 100644 (file)
--- 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 b14008a370d4ea5df03ec82e44e810b3f57d3743..f1a1ec69782eaecbee2027a059282bf92873d460 100644 (file)
--- 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 a6476e7f70b323b66b838303db54309bf75ce215..283d729e39cbae890aa1695fd2b0b211a49a1df4 100644 (file)
--- 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 1389a685446c9463d05a61cb3a3b8e0f9c2e1c63..4737bb5b25880baa8b3d5b1b58e4caf5853d3942 100644 (file)
--- 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 83ccd5afb47a70ff8400bdb160ccadf2b2708c29..4a797469340f1b7ecfca4b21384c7b48b8904760 100644 (file)
--- 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 3313633d07d056d4d58531157c168a9907075fbd..aa039dae311385b77ea78fd9f2d5325515261bf7 100644 (file)
--- 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 a4be617d6ad6ed91a51f0f2fc560c040fc5342e4..071ac55e8da6c017d086b4f4ed3fe206151421a3 100644 (file)
--- 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 1e1ccc0773db745fbe38c2959090ec92c719ffa8..432ed437b796e41564b38325707bb670613665bb 100644 (file)
--- 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 33d2bef1d8b119211d385d2b4836ade5a927208c..001828dc90311d6e6b4b2713be6a3d0c5610a824 100644 (file)
--- 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 ec6cbf0fb5c1988b382ccc3c2e51f274e882025e..3667bf8498d923a858b0eef5f7fd4618fcd86db9 100644 (file)
--- 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 a3acdb2abbb00644c89d07ca79531ac765f9966e..2dbd092a2a7ff8743be3b551b50b205c703606e1 100644 (file)
--- 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 4395647c1a87ebe75a1d6d0ad31066dddbb436c5..fb1eade03ed7edee18555d31384ff382ba6829ae 100644 (file)
--- 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 a5fd760783205ccecc4cbe42d8d7ae0d417a52ac..b39339aec998ca212e6652e01cd9ab76992c4846 100644 (file)
--- 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 6aff317046bdf1f92a3f3fb327b04b7e957b5ad7..de995772aac7743ff5b1ac24669a90fc53672260 100644 (file)
--- 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 ac16b40d3b2138f0c7aa62e713355c34625fb0dc..65693d7355a0ebbfe2328d073ff8ce1b6ec9c7ed 100644 (file)
--- 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 e781ba076aa7131f384abf4684793ce4617ee059..a279ec2af25f7b86e4e63ba051bfeff9cd3e28ce 100644 (file)
--- 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 c77229a01d21504ae995d7afa7a86fa1376caddc..7505ac0fd9a84a0064195408d59061f389f42df9 100644 (file)
--- 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 dbf4d3219027d37e39ad88582641dd3ceec41a78..fef9abe19f364aed401bfc0abead98b15d8afa41 100644 (file)
--- 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 4c460ef2367187e4a2db64a630c378de14656d10..f88d808c87259556be959dbf2d7fbdadff10dde4 100644 (file)
--- 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 b7cd1d81488bcbec957cee152c78a8f685d8cbaf..129635d782dae294922cdc16a847446a174fca74 100644 (file)
--- 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 b28e405e161105d305dcad955c36a3da25af074c..e0276bd2aa83de6989c6890694950810cffb5dc5 100644 (file)
--- 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 f250ea3aac3586a195be46c0ac4ab064fb3b86f8..e86ff9b53f060b6ba7f83da4feeeaf1904691f4e 100644 (file)
--- 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 8a628cf9b1eb6932ddc61ff019e11520b3d2db7f..12def35f246f94662d1f95b26f6f67971eba19f9 100644 (file)
--- 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 ad0806098ab741d166189cdd7c620e7fff715f95..4cb9e5d921566d9b9de9ff12c48b5599fb14b963 100644 (file)
--- 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 480b0aa190f48f1d8ad0b743a673cb80db1e090f..f07de51ba8fb37c68094f9c450a58e5c4bc645af 100644 (file)
--- 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 aeedbb28e5d4de19be7890da730c0760d1d1bfa6..e160a45708b33d3d5cb430ee83a14b485599ac07 100644 (file)
--- 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 fac143909f23b8d493657e2ce72a64962239262b..79f2370183883723afdd7b2248bdf785922c935e 100644 (file)
--- 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 23aeabb7b89cda34e9c025952f824c81262c0a4e..685007439c49087b3d587e0c732d18ba2e4bc55d 100644 (file)
--- 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 c66a8a8b905d624ee946284dc3f049c4535a2f1a..9ef660eb8b64002b410d45d711fc4c5d6a7b7fc7 100644 (file)
--- 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 063febd543d4ecfc7284d29d4186b2e41ebb5f2b..cd2255248e9f8e70b3f2ddeb38c598613ee9a243 100644 (file)
--- 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 0aef5b60657c21bff5b84d48d67b264efb7fb9b3..445759ee85e6517baeecd6487584046604e062e3 100644 (file)
--- 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 acdb677b63befc9e697fc2e99dc2104d79caac28..aa3236c94b5803db98597d430a2c2cfe06a265ee 100644 (file)
--- 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 9f78de3d729b7d417a60d039acbe3d147a1016fa..935058a2b873bdd35df52c5db35615190e70eb78 100644 (file)
--- 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 93e602e0ee0edfabfd79943843e20b688d8672fe..76d5e99647149abd4e1b915f14458062e95174c2 100644 (file)
--- 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 d28e003ba91266a749d44ed989ea9c0e223d2cab..d339c1a939eb0de797b76daac2e261352d5336e3 100644 (file)
--- 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 56e6e149d5f18c70471f095e49745bac454e1c6d..6ad82b8eb1beb0b08746daca54c1230ad553390e 100644 (file)
--- 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 96a92f133c7734c8855206079f1651d0b0ba8a48..55e73bdc5cf4e3679bcb7c997fa1a65c02d9f23c 100644 (file)
--- 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 125a26ba77b6b262d4683fdc7fa59ae99b98d5f3..a12ccceca4398da778940f0c147cc101e7c069a1 100644 (file)
--- 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 0f94d4da07b09cf84223244d94ce2f155f0b7ed9..4f5d6703e245a51c0f68fd4780284652ae0b2927 100644 (file)
--- 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 a1b5ad620727840857e12ef028aa2c9f28ddfe2d..21ac6643258b6779846d98a8a2bc1a9c4dd56875 100644 (file)
--- 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 b0dade59ed4fd4c19936e8bccdef2da4c902e86c..05e631fd0750efa9002bd07d9bbd44ac5f708384 100644 (file)
--- 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 b00306f1b3de5ae508e93be391172e226c7b3810..3f0e87fe8a476908d901f5de44526cfc8e81dc71 100644 (file)
--- 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 0892000ba5be22d626a66b7f9b58309ddb3dfcb6..f92346d21630a29476b6312087cfc67562385098 100644 (file)
--- 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 c496b2310440a17fd87fbf4aeda7b28802f205b4..2fa1f7ab756a2f7a951c0b1bbd0e862b6d2f3cc2 100644 (file)
--- 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 37dcde375943b0c4f0fe5fff1e8529a2935e25f2..cb8bce12fa147c9c3fbdc603d803e8f0973ce921 100644 (file)
--- 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 182f55843ff617354cc67c10bcc8f95645fe60ec..0087e1d17ca52db9ff3e25d350cbf81ab36b9647 100644 (file)
--- 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 772ce6d4a8a0b8cea04f220a469fad4482fb0b79..bc466981c5e4bc285873262b269d9657d785b9ce 100644 (file)
--- 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 9f0039c549505e8f5e775b2c46f60724ad34d894..09a5eaecd6a76600e8467042cc315ff6e5709527 100644 (file)
--- 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 d44de9abdbd051255138673bdad84d66f993ed51..a02e20ce687680f327cba695bb10c28f9c685275 100644 (file)
--- 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 238dd67f0b89d2b46ac0b2d30a37a4a0950d3933..27153b7192cc8fef6377550f5bca122588521274 100644 (file)
--- 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 64e0aa1ca6f6eccd8ee528f1634b867e3769fa97..917c92e60d48a4c27f7e3d77ee1504ebd0eac3e4 100644 (file)
--- 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 cdd70a1d904de0ea579a04059356cc4ed13e08a2..5b6373e7dffd5db7b9b39f4467042d68938da1c4 100644 (file)
--- 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 bcef1e71be1fa84284176b2d0cd92132fd949c9d..28cbdc52113fa885e50ddc32814a633fcd9aed75 100644 (file)
--- 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 7f854c524fe6e2d43d4af077210600a5a1164993..b76d2e80d7512ccfd24e4e0d5cf93ce7da9214e1 100644 (file)
--- 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 6d9a964ca77f306a6fb73d5f5f2d0837e5f7bbb8..c27e7a31fe8069930e405fd1669c4e88e0ac79ea 100644 (file)
--- 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 ae92c37fe5bf160db2aaef60e6f2dcb624b48009..da9370bc112bf3ae485e756bb129cd4e8cbcce93 100644 (file)
--- 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 303922a6c3cd4e339a30c7d2e0ed0bb154551221..c1ff6e112fe3ff406a7252f5aa77f3ef2888e5fb 100644 (file)
--- 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 fb5dc9a5168be9de8a0fc864a734eba348dd8048..0fc0d11bb03c3f138fa2260d2aad34315ce92f20 100644 (file)
--- 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 954896c1c0b58281baeed6db7759844be70a79b4..02fdd022822e0157e63eab7edb344a5e161a66af 100644 (file)
--- 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 344d99d25e53f16b4349ce9dbf4d2643121df013..f6042580fa186cab33dce1ee6d186f1ef57b9403 100644 (file)
--- 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 62165dfef7a96277f21b9c3a0687112e858bf6a8..b4b4d833463eaf9ca3dfb73b3eeb318768802209 100644 (file)
--- 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 8dbfb06343e3aa74b49652b8d73d916a9c06913f..1328e021e28df6c1ac6ff62fbf4893a0fe7cf67c 100644 (file)
--- 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 bf9b1c483f593c202f57a6421ab0a536c05c6c6c..0b5cde6dcf0e139b58c4c43ca3a8a5ac2cc5de10 100644 (file)
--- 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 8001e7002fd4a9afb82f7ec30cc1c556cac30207..cd980bcb12fcaa2d26ba6ccf688bcf321bad298e 100644 (file)
--- 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 e80ba14bd64200a88197d1fc24f0fc608bacd137..378ed188edebe7154e3b233cad9fb75ffc200c68 100644 (file)
--- 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 c0a1bb44c5179edb0cb25182a234270eb8b2d4fd..68805108ac1f6d0f8ab9678e3b1d73139a43bc77 100644 (file)
--- 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 a8f788582179beb5a35e454029c8b5bc3d56950e..a45bf40f1fa01339aaebe8faf7915c0ef710cc7c 100644 (file)
--- 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 50413eb24763e6da6b8c72fb733818de3e808635..14a329f47b00f9979226bf049582f328551cfd38 100644 (file)
--- 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 ca1916afe73ca035e5ee0c2746b887c6fcc1bc1c..03d933b9547c75ce97b877843f8239c72ad436ed 100644 (file)
--- 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 87d65e4c040a87264f9ceab0d60a879342ffc90f..35e96b21565bbb0a72f66ec77381ca533e1e78db 100644 (file)
--- 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 f4d8012b25a8015b16ead97cb4de7fdd2882de47..98a7c4824064a3a103ade17d5a266540f29fcb21 100644 (file)
--- 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 499319f7d7549f0053f9156a8596d43f063948a7..14d786804c418190b1d99420a4c04610f143600a 100644 (file)
--- 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 f95b1ff6e3c5adb862863ef72df99f79718d527c..f5a8dec24a3f0fa49a26e3708e818f8771260661 100644 (file)
--- 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 fb5fa21c6311e4b5db19a35ba508f244458b14e0..6ae6fb454509af6c38e811a0804564c0a1cc8981 100644 (file)
--- 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 aba2fc6c3f0bd68ef4cd4c1fbee79b130ef4e2a6..826cb45ba70bbef32f768448637a1fbaf6503c1f 100644 (file)
--- 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 d5b63e630e50b7187f90a1068f37d5a888470dfa..50fd46a589e0ddfa28f3cbd3e7361947ffceaa9f 100644 (file)
--- 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 efa4c997ee700461df2d9711cb8f53699fcf9b40..6fa117ef2346f9a85e96b2013cc4f2d6625958b2 100644 (file)
--- 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 03b7c265a0a7acb7a8439f2990657bbf2bf47ba9..b97a7613898f39d88e5d0e23be498c7908035e59 100644 (file)
--- 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 21a79e1662abd6984345c4672b2b1b90381601fe..9e5a7e5270105cca656cdb3141abb19da1c40931 100644 (file)
--- 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 1b52cc33a234799c3d585dde5f71fa2034f6b758..e1d4aa6a72248b46c696c10d211a659bbb27ce02 100644 (file)
--- 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 9c23c9b56f823139e566141bf17a9f37e267405e..2062e9ac5852bd47bedb64b976bc105fa835c4ce 100644 (file)
--- 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 bd6d9aef0a42bbf9e8b7d3ed7a4520ebd7d21f4e..f15b94c5fc9ce2e4bee0d4a42e9a5bfac145660d 100644 (file)
--- 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 634186a2dc4b22cf39cec69461b56bd5b9683fb3..9c666430f5903b5770f02abf9436fb7a39f5a4bd 100644 (file)
--- 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 364066feb21b3c787b535857ba87569770bf4a6d..d55ef3e897c7ef195ae6a1d3c725ceb7dcbe0d22 100644 (file)
--- 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 92e0479f0a77be33626b7f2e519d01b2a15257a6..5a69f3c4dda9e8125c4dc090876b3e1de7d47c87 100644 (file)
--- 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 eaf2754285b487faa532b1ada5ec9bd4bef583cb..596e0605e35f62a03feaca39cdf6c72060c40fdf 100644 (file)
--- 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 bd41a566411c7ecd599a4768f38cf82f0aebdd02..641bdb71e9bc687a1fa02a813d172e5cafb30506 100644 (file)
--- 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 400edf0bfc9601f84520135d9e2edc610adb2970..e464e407721dc97dc565abc8729fc3d245786622 100644 (file)
--- 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 19117a0af41d628ef8f0b5a1dd019250738747fd..a57715e77c766d40dfb0190e45757e7772bf7841 100644 (file)
--- 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 1b057ef8eb21a003020e65cd0ad2814b0f5267ce..da78519c8e6836eb20a866fbacf92063191836bd 100644 (file)
--- 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 1351eb85f2f7b55441b438d02e6e91dbaf25131b..6123cd374d792d06f2eb7bd6bf8b960fd4f30b22 100644 (file)
--- 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 b810384ce06e0c10e6afb0ff4304916d24f1abf0..72db44dd6bbdc3b43dd8939242cd4d982b03c46d 100644 (file)
--- 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 276c7333bb4578be6941281abb0ac53985c5ca2b..9261eb418bdb1a136b95f49e50ca246b90f72de7 100644 (file)
--- 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 83c26424576a61a31343e0db7afa4def734022c6..d325bc9201a4e1f7185bbaca69a4bcbe6dd4002e 100644 (file)
--- 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 dde0dc3662c66a1955739eeb80ddcb68e5b646b6..c3b58455323fe89eaa448a16a8752be92ae051d6 100644 (file)
--- 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 a58a54e3cec5a0485843eab8fbb09a732b5e657b..dcae282e289f16b5a604d9cbe084632e0300fd8f 100644 (file)
--- 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 abe393e44c94db848e1837330530496163acec0c..3ee50e23a9fb4ada2c638f0d1663437ae08da73f 100644 (file)
--- 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 d27323a5fbc07ffdd690481f5b6176b9d9c43285..75353cd11239e20237b65610f44a7f1f26f13afc 100644 (file)
--- 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 3c4ec171fefc86a24d8e4d1c045ad9fa31e56679..63568caa7859bfbb8935631e98ed9cdcf1abfcc4 100644 (file)
--- 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 0d4ec5c10126e2b24b1d32a70634d1b4498026b9..7eff61645ed4a06618fc092506fc900d510f288c 100644 (file)
--- 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 b262b379be47db59c89cb15834a048c8482d0fc8..6a92e7fde8160fbffd886f5aa6816f519552ed3d 100644 (file)
--- 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 067d8369c768930824771074917e19e860e13a43..2ce8720b75c1a0882de4343c57097ad9fe2911b1 100644 (file)
--- 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 cbfe30d536d0b88f002a511ae1fc00203b0848d3..8a0ac618e82a0c4ac74273184c875b252ebe590d 100644 (file)
--- 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 4b380beee2720324976ed3f5a44568d0a1f23b19..a657db956bf013114b2df8189dfe367dd40d0b9f 100644 (file)
--- 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 785cad7762e9d9f785af5769715da56114f39e33..038ffcd9998c4c01a7e22d563d0138e6aa9b468c 100644 (file)
--- 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 a8afb15ebae7d8bfb09a715bb7c6c9848d38e3e1..72cded07fd27bfb3a54b264e9f476598022b0ac3 100644 (file)
--- 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 a4acaa65b2d54a7215ab5ec44551a7a100cf7672..e107109c2d5a4aa6ef4f0a990a3c6a81a767d7f5 100644 (file)
--- 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 dca910f23cd9f5744a33fbb8ad87fd595b11185b..475461471f04cb8e47bf6dd517a7c8b58edfa2ce 100644 (file)
--- 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 3b5eb4fa6cfdb76d59ea03aa6fd432349ba0f68e..e651410b536fc20c8ca18c55a479c736ee2d1689 100644 (file)
--- 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 63aa8dffaf9e3b8541d215c28c1d0974d9cc765d..cf74052d70bb854d9c19ef0b8ce5e2230236dc1b 100644 (file)
--- 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 c8e99513f0a0ba00c393dcacd70629fe72fb8baa..28e5d53951b6453c2fc312170c0c2565746b2eb4 100644 (file)
--- 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 061303d993589db039ea67bcf847e4ec6ca9e787..b7d510e6b00b99ae42a7ffc0c97e65fbe0acab40 100644 (file)
--- 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 f0ec5cf40591d4addb24f03a5ae528ac933167fe..f31506238e0956fb63ce9fff922d5553bcc6792d 100644 (file)
--- 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 cc36a68c0b0f156460aa34ba30ecf5bfdca684e7..379224dde4e501bc6e79cfd466d39f31129f8ab2 100644 (file)
--- 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 f49f4361204f88e203fb2413cfc6239123d7b3bc..89e18c514a54b4c43f17aac931badc1ea6e6e9a1 100644 (file)
--- 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 1d3fd96491f19b36edd3aee96feb68886c05c32b..3e5689ac8724e47160991ad6e850b8d38de7975a 100644 (file)
--- 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 46b3566adf8882bc6a69ed77a3af38fa8d1a1cfd..a58b867c1440c8c1c05b6e8dfd3dcd40b574cbab 100644 (file)
--- 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 20c50ff686b92e1e68641e72ff63712b32bf166c..88f44ca5fc9d51fe8a952680f8ac4cc9520cf868 100644 (file)
--- 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 d1c0acb9cd34c060a0fcee2d486d3809dd160f93..5f59f1ea15ec17c96f1fea5c9dec92cc0faba402 100644 (file)
--- 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 8f27d9e6c24fe8e16f8a4368bc473a5a6b4e4cbd..5c4da8d900dd0244c7a3e4435a640f3450667407 100644 (file)
--- 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 4c96186289258f3b44a4544c9849ebbb59884994..687e987d75803ee1de7f478ee502bd2623c8269a 100644 (file)
--- 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 b5af4b053bd910e5d57c52ac0709c8e3731e103b..e1ad927f31de399c8bec29ccd3ba2ff9132312b7 100644 (file)
--- 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 a3a393e472ec88ad188ed61e78b0d647d45b71e9..211059a6010b68d6c4f1595f7635812153c86905 100644 (file)
--- 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 edf954dadd7b602e1b4c332563693098ca903372..4e6a26cc72d7a364b5d081457c02a68bab62a7ff 100644 (file)
--- 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 3f9794fc6b4d6173fd44cb9ffe21555df41b03d1..692f64275a8465270e986b572f731283c3a24ca6 100644 (file)
--- 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 bd36a8d5980df6ff1a439217a6c050be61239ff7..171056db54dbc7acfb25aed42da61640267f5842 100644 (file)
--- 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 a6246713320ad09420470e1472be8039e0ad4158..045f6028373c857c7cba839625485da996fb647d 100644 (file)
--- 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 dfed513675af7df0ec6c21edd3fe6e44b9c55707..87afe3f9bb34d38eb8e407a0db7e58989d473419 100644 (file)
--- 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 3035a113c34d34b08b6dfdcbef2e387bd75f2226..62a303c492bfa4933c3d4369c96a1b4af5cfa24d 100644 (file)
--- 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 74346cf054e45ecb801f0735addfaa5424ca8462..6c603ead91d0e1d77e73d898fdcd4258744acf20 100644 (file)
--- 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 0fe37c71da9b53fc691705893b77961014636150..651b998a4a5add9d6968dccf2d998c39920c3d31 100644 (file)
--- 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 fe04ca7e1d54db10d5859c52d7caa5572b9084f7..899f477ca9ea7d109f3cb0f2ae8e46d042a78083 100644 (file)
--- 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 0ec28ffc1694fd44fb3bba47ce16410bf30a7de5..23cb64ea46b67c7f65d46069be74f8ffa0c679f3 100644 (file)
--- 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 e3b33a0a006db17a2e65c1fdc4e63e68ca39860f..8a5b1c4f97da42b102ace935c6d9378367f4f129 100644 (file)
--- 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 1214ffdc316a4cf57bf0d1178ade9f013a027fff..43cb97c8cfa188b0ecce74e88cc31308e0571e6e 100644 (file)
--- 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 7965125c860e100605d614c8cf0c4864516d30c4..c3f5f5740a06a96d936f4e3a89354c1296c4bd32 100644 (file)
--- 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 9fa80316a8f8aaa49ca37502199919f86e062b91..8703a61556bff2d38c67ccdba23facdc0db8ea14 100644 (file)
--- 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 e1aa7b8aff04ad6b66b541a0cea8af99e225d551..dfa1cdffabec1c77de903682f86332dea9de0528 100644 (file)
--- 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 ed8ac48e0157781b0181925f91d9f22bbfc9d161..5b973bb2ffc8664c31c737c35369d9d79a3d6da7 100644 (file)
--- 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 8de89c70bc2c49c8aea5b8eaba77eada4a3e51e5..dadc7b49ef83af311dbc7bb89677ce68a377137f 100644 (file)
--- 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 2dc10c6d646670bef9f0a375eb632079662a2a57..3245f001e8b75f7d17595e19bd4696910426e54c 100644 (file)
--- 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 defb38c5b33818acaff89e155936f919c0fe3148..ef76c2f450e7beccfd2e3c3534223e8015455e96 100644 (file)
--- 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 31b6d3e448e83c93c654086d87ae1428532fce66..9c58c294891029cdbe08a1fffb2a9c216ba2f035 100644 (file)
--- 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 5d07c9f1995aa90025409fc2ae9b927ce83fc86b..f07f81c8415c3e66f933487b8596e9dc280f7eae 100644 (file)
--- 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 c853e8d06fd43cd898dc49cec27fd6dff58bfebe..3cf78d415c9b1d6598f92083c20454d95857c7ce 100644 (file)
--- 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 a357d7125d3b52d0239c5f1f2874afe656d3f420..73c3c33ffa5a181cf6d8cb5100b3a2c01ecb0b89 100644 (file)
--- 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 117c0e418afe3dde1b2ba0eb6be9fd65750b1ddf..ff30a8ab6b75444c33f9cddc79e6bc5ec4674474 100644 (file)
--- 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 b1f957bd5c28ffc45511eb7ca175d13a300e3387..1fa02a5281f258f00fa9435615e6b511c2584061 100644 (file)
--- 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 36bf51a1c02dda6207d40ef95dc41750eff2d295..048c8307a4410809f0bd593f67943b4c4e1ae124 100644 (file)
--- 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 7ffc4f767128e98fa55a0987f42ddbd3f6ccc10f..c9a154cc80910c570d7df196e41023561a6ef9ac 100644 (file)
--- 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 38a00552975e0206626e55273642913db873c8b6..266dac91a278199b1a33bf935d1df4fe48319271 100644 (file)
--- 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 ea7bdf133d73a318431170792bc36ef97b4c1f2f..12b266e51532b0e89986e5e00c1d5667fe74c4ab 100644 (file)
--- 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 d0f5529637e9e2b19ba53843482aac6fdebc54bd..a2921fd632d4303c93898a3f80868e4a3252aa99 100644 (file)
--- 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 e02c31db2acdba1d2154d28d44f7507b0afbcf76..964d2dbc9795068c8c24d6276e03ff0bfad3295f 100644 (file)
--- 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 04773843e40a7af2aa256874c5b28489a9970cde..a087d86a657622c565c29db958a7c6d5239c5f66 100644 (file)
--- 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 c6ff1e1165b003317860c746b8339e04a3729441..411403e8fdc5165f5321c8189c446aa30fdf72e5 100644 (file)
--- 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 d9a50cacf288b193885b415b0fbef627e1aa0626..74bfde722260bdcf3f6f0298a2e7596270f1ac9d 100644 (file)
--- 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 960afa0b3ad6eb60a20024eddf11c1922da83fb4..f0ffc518c328b80ab54dd129a3193d596db8c956 100644 (file)
--- 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 58895a88ba1750ca646e4b04f4c6b5c0590c781d..c133a33b6946f1b3b09a2dfadec7ff20d6dcc128 100644 (file)
--- 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 382c5802b9229c0d421118d555c81adfe760ddc6..24ddfe0c7989478ec722e6ba2c5466f3ddcb75af 100644 (file)
--- 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 f718704068509d83474243df59f948226cc2bfd4..ca4b6ec59218630dbebb6e53a01407afd90e04e7 100644 (file)
--- 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 5b5689a34352f661d3d848e10758edffd6e8f719..c0b2aa707a4534777433b0c8353c50e63c534c83 100644 (file)
--- 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 e52b3a9d09d593da3e742bc67389a573fab75cce..5ef452a75dbdc8ff0711a7967f9be01a4411e438 100644 (file)
--- 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 1d31d3ad3eef4022747f47797acb7cee4337ae4d..44b6da3222fc23d1c1f52b02c1aac456a3a29917 100644 (file)
--- 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 0e77ccb46644f15044f1fc0e36f8151f23af6858..b23e20a5632fcb94ce168c870648251c3a6eca70 100644 (file)
--- 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 2322326d064313b84d550fd696f35458f62ecbdf..29b5e6ef0c26fe9d8ae7714aef6ad848b54b33a5 100644 (file)
--- 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 6644ef66c12ad1d1c6b8ad694000b76343a42dd7..7833f17cf4e7f67f3d0fdf393d270d41b89668e0 100644 (file)
--- 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 3491944f93a1c2cb74e1ed9abb0699f1cd5db1ce..29e6c685a7804ef202b0adaf073428b317d08cd7 100644 (file)
--- 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 45e226d7ec5bafd28ff508c5b044750ea7ce7bbf..ae6a216a6b5b21c561b407aa77af65f6a778ab6a 100644 (file)
--- 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 9ba52d1303d20bebeb4d62c7b508f77fc629b25f..f8f4f0f13c766af28f384318e6a79097dca389b1 100644 (file)
--- 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 0e735bee17a718366e16cf0b20f3fa3ffee1efe3..faea33978f4d07d51ca9fd7e045adb1836406c3c 100644 (file)
--- 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 02bfca163324369a67a198d4f7addf2d84094f66..72da30143668254a471ed3c75ff756135191f7d0 100644 (file)
--- 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 5a7f207d7ffe123158391c845c9d94b40c34cbca..8038c9f859cc7f5b12c09ab8a3bf14d43c88f8a5 100644 (file)
--- 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 abd0e1862f112ed28fadce6c4758e946662dbe2e..18208b1fd9c6f5aec66699fb593086950cd5bb69 100644 (file)
--- 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 3ead2e43c7064c66cbd3d38e7690fdaa2da662d4..cd3db1a0e518430b1c3843ce8b7dc5bb108bb5a6 100644 (file)
--- 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 51e1e4e5cf8eae246361a52f49c871785a1370ea..67b00eb81bb4a67825f9f63fad651e23fd0418f5 100644 (file)
--- 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 61d0b8025d4ab5934ada6e07af25d6c1b8096e07..2f9056cad86233281435ef1828744de02d375c66 100644 (file)
--- 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 35c7a9175b1e2a210ed4cb5edc610dae4f349eaa..e4249838ee5b41545c45500eeb36e679468cc7b6 100644 (file)
--- 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 2fe8d9dde0f8216a6c13460b692f712c78c233dc..25920146949e5aa9394ea9afac3c53a6059426aa 100644 (file)
--- 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 cd6a9c21978167597439b5f0bdc18cdc62e01616..3439a27a4c6389a818b7ec66b137e54aa1b6309d 100644 (file)
--- 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 844a9e55b3dd758fe6bb11b5ebe85c40437b3acf..3a871924af38b06e4db27ab7b921897053599aa7 100644 (file)
--- 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 80dfe12856aabfb08c109ae7b3d7c98d195541c1..87eb9ac281e3929fa5e701f41c736fe908961a47 100644 (file)
--- 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 d71baab3d639492fb30e98801c1576c7b8c48478..2fe57e4846a5866202945a284e7a2caf0404676d 100644 (file)
--- 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 a5ce52d3cddc52be9060a07b0223d655ba7145f9..1b4140de065a34de7c3b03eb446498583e1af7b9 100644 (file)
--- 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 836dbb7d55443003dd80740fd4404efd935a91d6..492aeb4ca3c8d0398a3c9048290c69a4986fbdd9 100644 (file)
--- 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 21682795ebb625fbf6f90c90717410fe165c802c..4780c2ca3ab451d4bd23ddeded52507b4465d50e 100644 (file)
--- 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 580a08b0d38ffe8de3778aa388ea557e4e4a448d..5159568da1c18455819239ce825b3d1d82124b93 100644 (file)
--- 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 d3422a5a2a87baef898e8ed68e2d8d6ff58a6bf2..208a3156b03ddd8a6904212ee9496e2d5a8d5db0 100644 (file)
--- 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 6a10edba8174efbe0cdc475c43e7be36f38c4513..3e2d410f1407ddf72ddd0f24a5c18dc9c8d65ae9 100644 (file)
--- 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 6bbf364c0cda5e299dc15f30139d6a7d8339e3ea..ec15a44a9eb55aa8d0d93700e0c9abbaae1d6f7b 100644 (file)
--- 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 af06548bee22a18cbeb00dd525689d88329be6e8..fa8e9a2a514b53c3ad421c9d94cb654c484e9066 100644 (file)
--- 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 d80db6a9142fd5ab93c12603d51385897e289241..5b2d0bf5365d35357420261c259a2ea5d569af76 100644 (file)
--- 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 f5fc24578c75f5dd5713e20c0873f3517fa66e4f..e23b0f2adb7da8a6af123fc447611c6f7b3cf2eb 100644 (file)
--- 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 de10d8ce3e66c94f28d980684e8e536229e7c605..5c8342eee7a1d808ad15af98ef6ca7d24ff6ed0a 100644 (file)
--- 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 dfacd2a012a00545c9d87d0123032f447a4952ab..b159d91b073a1c55717960cd63c4ac86d91c6d81 100644 (file)
--- 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 ea4773c44574d72e2b8292ce0bc8557fa6c5937f..9f4a9203c07f09c0075cd985a1cedfe73944684b 100644 (file)
--- 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 883843aac925d48f5e58ad6845103b51d280747c..3627aed81639e443c84ca4ab631795c08f0b279a 100644 (file)
--- 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 691adda332cbfd91eb936686fe9b39d8f7b949ea..8a920faccaa89e7ce5d8fd4d778a782a464f1432 100644 (file)
--- 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 b5a326befa80cdc27975938e32fcf8966c7670b9..0860a500c02e9cc2abfa046908f1732028938401 100644 (file)
--- 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 124431b8d140e14c242af1544c6d25d249b9fa6c..1dafda380109f7e4a3ca54557077619cfea03969 100644 (file)
--- 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