diff options
| author | Tom Rini <trini@konsulko.com> | 2018-03-06 19:02:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-16 10:28:52 -0400 |
| commit | 6f6b7cfa89e5aa3b643196a4ccc8b1ba5d6fa7a4 (patch) | |
| tree | b2da03ec76a5c1f3737b201c95de45ebc68d1a58 /include | |
| parent | 7dc7a38c79d2f3fccda845ce7ec4a623e1d26335 (diff) | |
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>
Diffstat (limited to 'include')
166 files changed, 0 insertions, 178 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index d28e003ba91..d339c1a939e 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -441,7 +441,6 @@ unsigned long get_board_ddr_clk(void); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 56e6e149d5f..6ad82b8eb1b 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -204,7 +204,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc*/ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 96a92f133c7..55e73bdc5cf 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -370,7 +370,6 @@ combinations. this should be removed later #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc*/ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 125a26ba77b..a12ccceca43 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -334,7 +334,6 @@ #endif /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 0f94d4da07b..4f5d6703e24 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -297,7 +297,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index a1b5ad62072..21ac6643258 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -347,7 +347,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index b0dade59ed4..05e631fd075 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -279,7 +279,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (CONFIG_83XX_CLKIN * 2) diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index b00306f1b3d..3f0e87fe8a4 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -205,7 +205,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 0892000ba5b..f92346d2163 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -286,7 +286,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index c496b231044..2fa1f7ab756 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -304,7 +304,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 37dcde37594..cb8bce12fa1 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -340,7 +340,6 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 182f55843ff..0087e1d17ca 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -301,7 +301,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 772ce6d4a8a..bc466981c5e 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -322,7 +322,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 9f0039c5495..09a5eaecd6a 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -340,7 +340,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index d44de9abdbd..a02e20ce687 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -204,7 +204,6 @@ #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 238dd67f0b8..27153b7192c 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -229,7 +229,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 64e0aa1ca6f..917c92e60d4 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -175,7 +175,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index cdd70a1d904..5b6373e7dff 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -299,7 +299,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index bcef1e71be1..28cbdc52113 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -227,7 +227,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 7f854c524fe..b76d2e80d75 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -205,7 +205,6 @@ /* Serial Port */ #define CONFIG_CONS_ON_SCC /* define if console on SCC */ #undef CONFIG_CONS_NONE /* define if console on something else */ -#define CONFIG_CONS_INDEX 1 /* which serial channel for console */ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 6d9a964ca77..c27e7a31fe8 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -207,7 +207,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index ae92c37fe5b..da9370bc112 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -214,7 +214,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 303922a6c3c..c1ff6e112fe 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -338,7 +338,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index fb5dc9a5168..0fc0d11bb03 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -201,7 +201,6 @@ #define CONFIG_SYS_MALLOC_LEN (6 * 1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 954896c1c0b..02fdd022822 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -246,7 +246,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 344d99d25e5..f6042580fa1 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -529,7 +529,6 @@ extern unsigned long get_sdram_size(void); #endif /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 62165dfef7a..b4b4d833463 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -338,7 +338,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 8dbfb06343e..1328e021e28 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -143,7 +143,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index bf9b1c483f5..0b5cde6dcf0 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -293,7 +293,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 8001e7002fd..cd980bcb12f 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -454,7 +454,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index e80ba14bd64..378ed188ede 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -463,7 +463,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index c0a1bb44c51..68805108ac1 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -367,7 +367,6 @@ unsigned long get_board_ddr_clk(void); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index a8f78858217..a45bf40f1fa 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -473,7 +473,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 50413eb2476..14a329f47b0 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -419,7 +419,6 @@ unsigned long get_board_ddr_clk(void); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index ca1916afe73..03d933b9547 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -367,7 +367,6 @@ unsigned long get_board_ddr_clk(void); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 87d65e4c040..35e96b21565 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -161,7 +161,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index f4d8012b25a..98a7c482406 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -151,7 +151,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 499319f7d75..14d786804c4 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -274,7 +274,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index f95b1ff6e3c..f5a8dec24a3 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -73,7 +73,6 @@ */ /* FTUART is a high speed NS 16C550A compatible UART, addr: 0x99600000 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_COM1 CONFIG_FTUART010_02_BASE #ifndef CONFIG_DM_SERIAL diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index fb5fa21c631..6ae6fb45450 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -75,7 +75,6 @@ */ /* FTUART is a high speed NS 16C550A compatible UART, addr: 0x99600000 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_COM1 CONFIG_FTUART010_02_BASE #ifndef CONFIG_DM_SERIAL diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index aba2fc6c3f0..826cb45ba70 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -76,7 +76,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_LOADADDR 0x12000000 diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index d5b63e630e5..50fd46a589e 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -107,7 +107,6 @@ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ -#define CONFIG_CONS_INDEX 1 /* Ethernet support */ #define CONFIG_PHY_SMSC diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index efa4c997ee7..6fa117ef234 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CONS_INDEX 1 /* PMIC support */ #define CONFIG_POWER_TPS65217 diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 03b7c265a0a..b97a7613898 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -58,7 +58,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 on CRANEBOARD */ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 21a79e1662a..9e5a7e52701 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -117,7 +117,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ #undef CONFIG_CMD_LOADB diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 1b52cc33a23..e1d4aa6a722 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -155,7 +155,6 @@ * Serial Driver */ #define CONFIG_MXC_UART -#define CONFIG_CONS_INDEX 1 #define CONFIG_MXC_UART_BASE UART1_BASE /* diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 9c23c9b56f8..2062e9ac585 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -76,7 +76,6 @@ /* Post pad 3 bytes after each reg addr */ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 13000000 -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 0x3e000000 /* must fit into GPT:u-boot-env partition */ diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index bd6d9aef0a4..f15b94c5fc9 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -75,7 +75,6 @@ /* Post pad 3 bytes after each reg addr */ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 13000000 -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 0x3e000000 /* must fit into GPT:u-boot-env partition */ diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index 634186a2dc4..9c666430f59 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -33,7 +33,6 @@ #define CONFIG_SYS_NS16550_COM2 0x66110000 #define CONFIG_SYS_NS16550_COM3 0x66120000 #define CONFIG_SYS_NS16550_COM4 0x66130000 -#define CONFIG_CONS_INDEX 4 #define CONFIG_BAUDRATE 115200 #define CONFIG_ENV_SIZE SZ_8K diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 364066feb21..d55ef3e897c 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 92e0479f0a7..5a69f3c4dda 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -9,8 +9,6 @@ #include <configs/ti_am335x_common.h> -#define CONFIG_CONS_INDEX 1 - #ifndef CONFIG_SPL_BUILD # define CONFIG_TIMESTAMP #endif diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index eaf2754285b..596e0605e35 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -15,7 +15,6 @@ #define CONSOLEDEV "ttyO2" #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_OMAP_ABE_SYSCK diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index bd41a566411..641bdb71e9b 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_AUTOLOAD "no" /* Serial console configuration */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SERIAL1 1 /* UART0 */ /* NS16550 Configuration */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 400edf0bfc9..e464e407721 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -62,7 +62,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 19117a0af41..a57715e77c7 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -66,7 +66,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 1b057ef8eb2..da78519c8e6 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -128,8 +128,6 @@ "run emmcboot; " \ "fi;" -#define CONFIG_CONS_INDEX 1 - /* SPL defines. */ #define CONFIG_SPL_TEXT_BASE 0x40300350 #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + (128 << 20)) diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 1351eb85f2f..6123cd374d7 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -25,7 +25,6 @@ #define OMAP_HSMMC_USE_GPIO /* UART setup */ -#define CONFIG_CONS_INDEX 4 #define CONFIG_SYS_NS16550_COM4 UART4_BASE /* MMC ENV related defines */ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index b810384ce06..72db44dd6bb 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -105,7 +105,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ #undef CONFIG_CMD_LOADB diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 276c7333bb4..9261eb418bd 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -155,7 +155,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 83c26424576..d325bc9201a 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -301,7 +301,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index dde0dc3662c..c3b58455323 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -186,7 +186,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index a58a54e3cec..dcae282e289 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -126,7 +126,6 @@ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #endif #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SPI #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index abe393e44c9..3ee50e23a9f 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -91,7 +91,6 @@ /* UART */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 /* USB Configs */ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index d27323a5fbc..75353cd1123 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART0_BASE /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index 3c4ec171fef..63568caa785 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -16,11 +16,9 @@ #include "tam3517-common.h" /* Our console port is port3 */ -#undef CONFIG_CONS_INDEX #undef CONFIG_SYS_NS16550_COM1 #undef CONFIG_SERIAL1 -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 0d4ec5c1012..7eff61645ed 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -78,7 +78,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ /* Serial port hardware configuration */ -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, \ 115200, 230400} #define CONFIG_SYS_SERIAL0 0x808C0000 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index b262b379be4..6a92e7fde81 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -84,7 +84,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /*Console on UART0 */ #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 067d8369c76..2ce8720b75c 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -55,7 +55,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* * Command definition diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index cbfe30d536d..8a0ac618e82 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -100,7 +100,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_LOADADDR 0x12000000 diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 4b380beee27..a657db956bf 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -100,7 +100,6 @@ * Serial port */ #define CONFIG_FFUART -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 } diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 785cad7762e..038ffcd9998 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -22,7 +22,6 @@ #define CONFIG_PL011_CLOCK 150000000 #define CONFIG_PL01x_PORTS { (void *)(0xFFF36000) } -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index a8afb15ebae..72cded07fd2 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -277,7 +277,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index a4acaa65b2d..e107109c2d5 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -315,7 +315,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index dca910f23cd..475461471f0 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -82,7 +82,6 @@ */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ /* * Flash & Environment diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 3b5eb4fa6cf..e651410b536 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -43,7 +43,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /*********************************************************** * Command definition diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 63aa8dffaf9..cf74052d70b 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -13,8 +13,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */ -#define CONFIG_CONS_INDEX 0 - #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_MISC_INIT_R /* call misc_init_r during start up */ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index c8e99513f0a..28e5d53951b 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART0_BASE /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ /* * Flash & Environment diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 061303d9935..b7d510e6b00 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -97,7 +97,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 48000000 #define CONFIG_SYS_NS16550_COM3 UART3_BASE -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \ 115200 } diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index f0ec5cf4059..f31506238e0 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -128,7 +128,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index cc36a68c0b0..379224dde4e 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -98,8 +98,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /* Console on UART0 */ - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index f49f4361204..89e18c514a5 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -219,7 +219,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 1d3fd96491f..3e5689ac872 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -102,7 +102,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART1_BASE /* Base address of UART1 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 46b3566adf8..a58b867c144 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -81,7 +81,6 @@ #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 20c50ff686b..88f44ca5fc9 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -92,7 +92,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index d1c0acb9cd3..5f59f1ea15e 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -336,7 +336,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_LPUART #define CONFIG_LPUART_32B_REG #else -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 8f27d9e6c24..5c4da8d900d 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -209,7 +209,6 @@ #ifdef CONFIG_LPUART #define CONFIG_LPUART_32B_REG #else -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 4c961862892..687e987d758 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index b5af4b053bd..e1ad927f31d 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index a3a393e472e..211059a6010 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -74,7 +74,6 @@ #define CONFIG_SYS_I2C_MXC_I2C4 /* enable I2C bus 4 */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2) diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index edf954dadd7..4e6a26cc72d 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -84,7 +84,6 @@ #define CONFIG_SYS_I2C_MXC_I2C4 /* enable I2C bus 4 */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 3f9794fc6b4..692f64275a8 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -10,9 +10,6 @@ #include "ls2080a_common.h" -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 2 - #ifdef CONFIG_FSL_QSPI #ifdef CONFIG_TARGET_LS2081ARDB #define CONFIG_QIXIS_I2C_ACCESS diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index bd36a8d5980..171056db54d 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -50,7 +50,6 @@ */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_CONS_INDEX 1 /* * MMC Driver diff --git a/include/configs/mcx.h b/include/configs/mcx.h index a6246713320..045f6028373 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -60,7 +60,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 */ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index dfed513675a..87afe3f9bb3 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -283,7 +283,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 3035a113c34..62a303c492b 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -49,7 +49,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /*Console on UART0 */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200,230400, 460800, 921600 } /* auto boot */ diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 74346cf054e..6c603ead91d 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -49,7 +49,6 @@ /* Serial Info */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ /* No NOR flash present */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 0fe37c71da9..651b998a4a5 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -49,7 +49,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */ diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index fe04ca7e1d5..899f477ca9e 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -63,7 +63,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 0ec28ffc169..23cb64ea46b 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -65,7 +65,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* * Command definition diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index e3b33a0a006..8a5b1c4f97d 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -79,7 +79,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_ETHPRIME "FEC0" diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 1214ffdc316..43cb97c8cfa 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -52,7 +52,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 7965125c860..c3f5f5740a0 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -51,7 +51,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 9fa80316a8f..8703a61556b 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -55,7 +55,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index e1aa7b8aff0..dfa1cdffabe 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -64,7 +64,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index ed8ac48e015..5b973bb2ffc 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -77,7 +77,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 /* Command definition */ diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 8de89c70bc2..dadc7b49ef8 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -48,7 +48,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 2dc10c6d646..3245f001e8b 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -51,7 +51,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Filesystems and image support */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index defb38c5b33..ef76c2f450e 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -32,7 +32,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 31b6d3e448e..9c58c294891 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -65,7 +65,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_CACHELINE_SIZE 64 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 5d07c9f1995..f07f81c8415 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -105,7 +105,6 @@ */ #define CONFIG_PL011_CLOCK 24000000 #define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } -#define CONFIG_CONS_INDEX 0 /* Default baudrate can be overridden by board! */ /* FEC Ethernet on SoC */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index c853e8d06fd..3cf78d415c9 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -73,7 +73,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 on RX-51 */ diff --git a/include/configs/nx25-ae250.h b/include/configs/nx25-ae250.h index a357d7125d3..73c3c33ffa5 100644 --- a/include/configs/nx25-ae250.h +++ b/include/configs/nx25-ae250.h @@ -64,7 +64,6 @@ /* * Serial console configuration */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 117c0e418af..ff30a8ab6b7 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -11,7 +11,6 @@ #define CONFIG_MISC_INIT_R /* Serial setup */ -#define CONFIG_CONS_INDEX 0 #define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index b1f957bd5c2..1fa02a5281f 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -203,8 +203,6 @@ * are needed and peripheral clocks for UART2 must be enabled in * function per_clocks_enable(). */ -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 2 #ifdef CONFIG_SPL_BUILD #undef CONFIG_SYS_NS16550_COM3 #define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2 diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 36bf51a1c02..048c8307a44 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -35,8 +35,6 @@ #define CONFIG_REVISION_TAG /* Override OMAP3 serial console configuration */ -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 /* NAND */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 7ffc4f76712..c9a154cc809 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -19,8 +19,6 @@ #ifdef CONFIG_SPL_BUILD /* select serial console configuration for SPL */ -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 #endif diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 38a00552975..266dac91a27 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -29,7 +29,6 @@ #include <configs/ti_omap5_common.h> -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 UART3_BASE #define CONFIG_MISC_INIT_R diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index ea7bdf133d7..12b266e5153 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -108,7 +108,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SPI diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index d0f5529637e..a2921fd632d 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -554,7 +554,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index e02c31db2ac..964d2dbc979 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -191,7 +191,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/p212.h b/include/configs/p212.h index 04773843e40..a087d86a657 100644 --- a/include/configs/p212.h +++ b/include/configs/p212.h @@ -13,7 +13,6 @@ #define CONFIG_MISC_INIT_R /* Serial setup */ -#define CONFIG_CONS_INDEX 0 #define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-p212.dtb\0" diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index c6ff1e1165b..411403e8fdc 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -98,7 +98,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 -#define CONFIG_CONS_INDEX 1 /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index d9a50cacf28..74bfde72226 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -12,7 +12,6 @@ #define __CONFIG_PENGWYN_H #define CONFIG_SERIAL1 -#define CONFIG_CONS_INDEX 1 #include <configs/ti_am335x_common.h> diff --git a/include/configs/pepper.h b/include/configs/pepper.h index 960afa0b3ad..f0ffc518c32 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -72,7 +72,6 @@ "fi;" \ /* Serial console configuration */ -#define CONFIG_CONS_INDEX 1 /* UART0 */ #define CONFIG_SERIAL1 1 #define CONFIG_SYS_NS16550_COM1 0x44e09000 diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 58895a88ba1..c133a33b694 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK 115200 #define CONFIG_SYS_NS16550_COM1 0xb40003f8 -#define CONFIG_CONS_INDEX 1 #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 382c5802b92..24ddfe0c798 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK 115200 #define CONFIG_SYS_NS16550_COM1 0xffffffffb40003f8 -#define CONFIG_CONS_INDEX 1 #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index f7187040685..ca4b6ec5921 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -83,7 +83,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)) diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 5b5689a3435..c0b2aa707a4 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -259,7 +259,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index e52b3a9d09d..5ef452a75db 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -386,7 +386,6 @@ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (400000000 / CONFIG_SYS_CLK_DIV) diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 1d31d3ad3ee..44b6da3222f 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -232,7 +232,6 @@ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 0e77ccb4664..b23e20a5632 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_NS16550_COM4 0x481a6000 #define CONFIG_SERIAL1 1 -#define CONFIG_CONS_INDEX 1 /* I2C Configuration */ #define CONFIG_I2C diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 2322326d064..29b5e6ef0c2 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -95,7 +95,6 @@ #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \ 115200 } diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6644ef66c12..7833f17cf4e 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -192,7 +192,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SYS_NS16550_COM1 SOCFPGA_UART1_ADDRESS #define CONFIG_SYS_NS16550_CLK 50000000 #endif -#define CONFIG_CONS_INDEX 1 /* * USB diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 3491944f93a..29e6c685a78 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -174,7 +174,6 @@ /* Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 45e226d7ec5..ae6a216a6b5 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -76,7 +76,6 @@ * CONFIG_PL01x_PORTS is defined in specific files */ #define CONFIG_PL011_CLOCK (48 * 1000 * 1000) -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, \ 57600, 115200 } diff --git a/include/configs/strider.h b/include/configs/strider.h index 9ba52d1303d..f8f4f0f13c7 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -278,7 +278,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 2 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 0e735bee17a..faea33978f4 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -121,7 +121,6 @@ * open - index 2 * shorted - index 1 */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 02bfca16332..72da3014366 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -53,7 +53,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 #define CONFIG_SERIAL1 /* UART1 */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 5a7f207d7ff..8038c9f859c 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -53,7 +53,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 /* allow to overwrite serial and ethaddr */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index abd0e1862f1..18208b1fd9c 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -42,8 +42,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ -#define CONFIG_CONS_INDEX 1 - /* Filesystems / image support */ /* MMC */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 3ead2e43c70..cd3db1a0e51 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -43,7 +43,6 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 1 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 51e1e4e5cf8..67b00eb81bb 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -35,7 +35,6 @@ /* PL011 Serial Configuration */ #define CONFIG_PL011_CLOCK 24000000 -#define CONFIG_CONS_INDEX 1 /* Generic Interrupt Controller Definitions */ #define GICD_BASE (0x801000000000) diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 61d0b8025d4..2f9056cad86 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -122,7 +122,6 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Defines for SPL */ #define CONFIG_SPL_TEXT_BASE 0x40300000 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 35c7a9175b1..e4249838ee5 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -56,7 +56,6 @@ #define CONFIG_SERIAL1 #define CONFIG_SERIAL2 #define CONFIG_SERIAL3 -#define CONFIG_CONS_INDEX 1 /* * GPMC NAND block. We support 1 device and the physical address to diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 2fe8d9dde0f..25920146949 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -66,7 +66,6 @@ #endif #define CONFIG_SYS_NS16550_COM1 KS2_UART0_BASE #define CONFIG_SYS_NS16550_COM2 KS2_UART1_BASE -#define CONFIG_CONS_INDEX 1 #ifndef CONFIG_SOC_K2G #define CONFIG_SYS_NS16550_CLK ks_clk_get_rate(KS2_CLK1_6) diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index cd6a9c21978..3439a27a4c6 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -38,7 +38,6 @@ 115200} /* Select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 844a9e55b3d..3a871924af3 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_COM3 UART3_BASE #endif -#define CONFIG_CONS_INDEX 3 /* TWL6030 */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 80dfe12856a..87eb9ac281e 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -49,7 +49,6 @@ #define CONFIG_SYS_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ /* select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index d71baab3d63..2fe57e4846a 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -67,7 +67,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE /* disable vendor parameters protection (serial#, ethaddr) */ -#define CONFIG_CONS_INDEX 1 /* use UART0 : used by serial driver */ /*********************************************************** * Command definition diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index a5ce52d3cdd..1b4140de065 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -52,8 +52,6 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) -#define CONFIG_CONS_INDEX 1 - #define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_SIZE 0x2000 /* #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 836dbb7d554..492aeb4ca3c 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -26,7 +26,6 @@ /* UART */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CONS_INDEX 1 /* SD/MMC */ #define CONFIG_FSL_ESDHC diff --git a/include/configs/vct.h b/include/configs/vct.h index 21682795ebb..4780c2ca3ab 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 #define CONFIG_SYS_NS16550_COM1 UART_1_BASE -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_CLK 921600 /* diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 580a08b0d38..5159568da1c 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -234,7 +234,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index d3422a5a2a8..208a3156b03 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -105,7 +105,6 @@ #endif /* PL011 Serial Configuration */ -#define CONFIG_CONS_INDEX 0 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO #define CONFIG_PL011_CLOCK 7273800 #else diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 6a10edba817..3e2d410f140 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -134,7 +134,6 @@ #define CONFIG_PL011_CLOCK 24000000 #define CONFIG_PL01x_PORTS {(void *)CONFIG_SYS_SERIAL0, \ (void *)CONFIG_SYS_SERIAL1} -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_SERIAL0 V2M_UART0 diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 6bbf364c0cd..ec15a44a9eb 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -194,7 +194,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index af06548bee2..fa8e9a2a514 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -65,7 +65,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* * Command definition diff --git a/include/configs/x600.h b/include/configs/x600.h index d80db6a9142..5b2d0bf5365 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -38,7 +38,6 @@ #define CONFIG_PL01x_PORTS { (void *)CONFIG_SYS_SERIAL0, \ (void *)CONFIG_SYS_SERIAL1 } #define CONFIG_PL011_CLOCK (48 * 1000 * 1000) -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, \ 57600, 115200 } #define CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index f5fc24578c7..e23b0f2adb7 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -43,7 +43,6 @@ #define CONFIG_ARM_DCC #define CONFIG_CPU_ARMV8 -#define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BAUDRATE_TABLE \ { 4800, 9600, 19200, 38400, 57600, 115200 } diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index de10d8ce3e6..5c8342eee7a 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -191,7 +191,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index dfacd2a012a..b159d91b073 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -162,7 +162,6 @@ /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index ea4773c4457..9f4a9203c07 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -187,7 +187,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 883843aac92..3627aed8163 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -188,7 +188,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Serial Port */ -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 691adda332c..8a920faccaa 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -182,7 +182,6 @@ /* Input clk to NS16550 (in Hz; the SYS_CLK_FREQ is in kHz) */ #define CONFIG_SYS_NS16550_CLK CONFIG_SYS_CLK_FREQ -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /*======================*/ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index b5a326befa8..0860a500c02 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -43,7 +43,6 @@ * STUART - the lower serial port on Colibri board */ #define CONFIG_STUART 1 -#define CONFIG_CONS_INDEX 2 /* * Bootloader Components Configuration diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 124431b8d14..1dafda38010 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -40,7 +40,6 @@ */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_CONS_INDEX 1 /* use UART2 for console */ /* * Ethernet |