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>
2018-03-06 19:02:27 -05:00
parent 7dc7a38c79
commit 6f6b7cfa89
320 changed files with 181 additions and 281 deletions
--- 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)
--- 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
--- 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
--- 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)
--- 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)
--- 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

--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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}
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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)
--- 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
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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 */

--- 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
--- 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

 /*
--- 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 */
--- 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 */
--- 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
--- 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
--- 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
--- 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

--- 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 */
--- 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 */

--- 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 */

--- 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))
--- 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 */
--- 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
--- 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)
--- 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)
--- 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)
--- 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)
--- 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 */
--- 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
--- 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

--- 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
--- 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 }

--- 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
--- 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

--- 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 }

--- 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 */

--- 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)
--- 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

--- 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
--- 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
--- 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 */
--- 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
--- 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 }
--- 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)
--- 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
--- 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)
--- 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
--- 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())
--- 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()
--- 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
--- 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
--- 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())
--- 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())
--- 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)
--- 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())
--- 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
--- 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
--- 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 */

--- 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
--- 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 */
--- 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)
--- 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 */

--- 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"	\
--- 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
--- 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"

--- a/Show More
+++ b/Show More