Convert CONFIG_CONS_INDEX to Kconfig

This converts the following to Kconfig:
   CONFIG_CONS_INDEX

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index df02489b3b6e50c7ac617587aae3142955280542..be88f28e9e3da16ff1665a408b7921fd037abae7 100644 (file)
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -10,7 +10,6 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set

diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index 459096db4f55b0ee6433d32424d0c7ae8056a4cd..fea5aa01745af327ef0c57b5c017f2b2562ebdac 100644 (file)
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -10,7 +10,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AM43XX=y
 CONFIG_ENV_OFFSET_REDUND=0x120000
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI,QSPI_BOOT"
+CONFIG_SYS_EXTRA_OPTIONS="QSPI,QSPI_BOOT"
 CONFIG_QSPI_BOOT=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y

diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig
index 66fe74407f12927290a66dca28e925cd493dbd9a..8f1e60fd3e5df5f8003b44b9b72b56bc47eb7760 100644 (file)
--- a/configs/am43xx_evm_rtconly_defconfig
+++ b/configs/am43xx_evm_rtconly_defconfig
@@ -10,7 +10,6 @@ CONFIG_SPL_RTC_DDR_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set

diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index d1a6fbe7538754669f5aa822069d5622c1418bf4..7afd328a4983c00ba5a6d6506686cf4d22e7e269 100644 (file)
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -9,7 +9,6 @@ CONFIG_AM43XX=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set

diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index deaa19007faee4c202b94a250b395da8b1a55660..79a0466b5ac29f0bcc7622676521e63c0547240b 100644 (file)
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -19,7 +19,6 @@ CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set

diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index 2eb03ff67cc3da6a2c5f8f3d0e997958a3039ede..a20798be544318183994ba8ce9e6e9d0f340f844 100644 (file)
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -13,7 +13,6 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_BAV_VERSION=1
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y

diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index 851d6fddafa533ac83627e159408c7021f4cff81..f5d7e3f50a11f547f07ce8e40631018aa4df5c4f 100644 (file)
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -13,7 +13,6 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_BAV_VERSION=2
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y

diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig
index 41496f739bdac2ecadca0bd6b7a6d40970b54db9..6106090919108721760172163e9937037efbde5e 100644 (file)
--- a/configs/gardena-smart-gateway-mt7688_defconfig
+++ b/configs/gardena-smart-gateway-mt7688_defconfig
@@ -74,6 +74,7 @@ CONFIG_SPI_FLASH_MTD=y
 CONFIG_MTD_UBI_BEB_LIMIT=22
 CONFIG_MT7628_ETH=y
 CONFIG_PHY=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_SPI=y
 CONFIG_MT7621_SPI=y
 CONFIG_WDT=y

diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig
index 8ec66938cdce8175990f3846522b00ee143673f8..9115bb9d885fca1ff499a54b9a245fc9092a4243 100644 (file)
--- a/configs/linkit-smart-7688_defconfig
+++ b/configs/linkit-smart-7688_defconfig
@@ -60,6 +60,8 @@ CONFIG_SPI_FLASH_MTD=y
 CONFIG_MT7628_ETH=y
 CONFIG_PHY=y
 CONFIG_MT76X8_USB_PHY=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_CONS_INDEX=3
 CONFIG_SPI=y
 CONFIG_MT7621_SPI=y
 CONFIG_USB=y

diff --git a/configs/ls1028aqds_tfa_lpuart_defconfig b/configs/ls1028aqds_tfa_lpuart_defconfig
index e0348279d9f9981bc1412c312805a6b5f9a8e51c..f3475b558a505637aad1ff57122a056c14cefa8d 100644 (file)
--- a/configs/ls1028aqds_tfa_lpuart_defconfig
+++ b/configs/ls1028aqds_tfa_lpuart_defconfig
@@ -75,6 +75,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
 CONFIG_SPI=y

diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig
index d9173f4086663eb8fdcd255bd0b022748595e21b..aaede4a70b93e0eeb197e57d45772c136fc68f43 100644 (file)
--- a/configs/mscc_jr2_defconfig
+++ b/configs/mscc_jr2_defconfig
@@ -68,6 +68,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_JR2_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y

diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig
index d5639016958d42538cb004d5c565a9b8757e2e41..0846ee84741bdaaf433e019692786a07f5136c66 100644 (file)
--- a/configs/mscc_luton_defconfig
+++ b/configs/mscc_luton_defconfig
@@ -72,6 +72,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_LUTON_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y

diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig
index a0e04bd4c7496608aeb946b2213471257ddcb7c0..36ca158715bad4b30e892223b4334e0bee6babe0 100644 (file)
--- a/configs/mscc_ocelot_defconfig
+++ b/configs/mscc_ocelot_defconfig
@@ -72,6 +72,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_OCELOT_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y

diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig
index 1c86c0dca39bcebafb3128b078f6c3d9eda89fcf..66d9e1d315aab46670550212bf133de5407dd075 100644 (file)
--- a/configs/mscc_serval_defconfig
+++ b/configs/mscc_serval_defconfig
@@ -66,6 +66,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_SERVAL_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y

diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig
index 91347682eef358c61ed2a3183cf9002c0317163d..1f56875b5feb738cbcfeee61fb0749f012797501 100644 (file)
--- a/configs/mscc_servalt_defconfig
+++ b/configs/mscc_servalt_defconfig
@@ -63,6 +63,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_SERVALT_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y

diff --git a/configs/mt7628_rfb_defconfig b/configs/mt7628_rfb_defconfig
index f444cf98c6ced67a86cd3ae51d40c72a430eaa29..ba3b06263f223bdfd8ca6781d1007011765b1441 100644 (file)
--- a/configs/mt7628_rfb_defconfig
+++ b/configs/mt7628_rfb_defconfig
@@ -40,7 +40,6 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH_XMC=y
 CONFIG_MT7628_ETH=y
-# CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_SPI=y
 CONFIG_MT7621_SPI=y
 CONFIG_LZMA=y

diff --git a/configs/x530_defconfig b/configs/x530_defconfig
index de077cb71fde53d4ed1885226d9588ec2a9f95f9..2f1fd755fb36e87cb8ecd6b904b55bc626f6a33e 100644 (file)
--- a/configs/x530_defconfig
+++ b/configs/x530_defconfig
@@ -70,6 +70,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_MVEBU=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y

diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index 8f31fc4c745669ee428ace1c66d7635d6654a13b..ec0c531c4623d8270000ef7be6d63e3e3fba9cc5 100644 (file)
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -38,8 +38,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/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index f4440e57646617ca2243c0d4f805eb2773190d0f..90480520ab3f37add0ef185fbb5f55022a7fda80 100644 (file)
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -38,8 +38,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/brsmarc1.h b/include/configs/brsmarc1.h
index acf13b830a2e905c85aaa5d83849f1431f5a02d8..d0cc08baa635e6999f2515cd21dc317876d37c78 100644 (file)
--- a/include/configs/brsmarc1.h
+++ b/include/configs/brsmarc1.h
@@ -69,6 +69,4 @@ BUR_COMMON_ENV \
 /* SPI Flash */
 
 /* Environment */
-
-#define CONFIG_CONS_INDEX                      1
 #endif /* __CONFIG_BRSMARC1_H__ */

diff --git a/include/configs/db-88f6281-bp.h b/include/configs/db-88f6281-bp.h
index e234b0bf98264ed6ea83aa1303132886e86d28e3..06a7091be208cf2e448a69b70d430232cfecbb1d 100644 (file)
--- a/include/configs/db-88f6281-bp.h
+++ b/include/configs/db-88f6281-bp.h
@@ -29,13 +29,6 @@
 #define CONFIG_SYS_NS16550_COM1                KW_UART0_BASE
 
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
-/*
- * Serial Port configuration
- * The following definitions let you select what serial you want to use
- * for your console driver.
- */
-
-#define CONFIG_CONS_INDEX      1       /* Console on UART0 */
 
 /*
  *  Environment variables configurations

diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h
index 261749db8d3409623aab4f4132f4c9405af4b1c3..1b26466eda30e003823fb409f3a8246f091c923f 100644 (file)
--- a/include/configs/gardena-smart-gateway-mt7688.h
+++ b/include/configs/gardena-smart-gateway-mt7688.h
@@ -36,7 +36,6 @@
 #define CONFIG_SYS_NS16550_CLK         40000000
 #define CONFIG_SYS_NS16550_REG_SIZE    -4
 #define CONFIG_SYS_NS16550_COM1                0xb0000c00
-#define CONFIG_CONS_INDEX              1
 #endif
 
 /* UART */

diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h
index d7ebfeda4c568498fbc8fc38d2095932b2b9585b..e7a7ae319897e6713fdfa6064c5e1e7e8c7d443a 100644 (file)
--- a/include/configs/linkit-smart-7688.h
+++ b/include/configs/linkit-smart-7688.h
@@ -36,7 +36,6 @@
 #define CONFIG_SYS_NS16550_CLK         40000000
 #define CONFIG_SYS_NS16550_REG_SIZE    -4
 #define CONFIG_SYS_NS16550_COM3                0xb0000e00
-#define CONFIG_CONS_INDEX              3
 
 #endif
 

diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index ec2ed7c609695dfda025b1fdd9bef6cc5dde46d6..e76e54e97fc977a2089edf378aeba13c888903f0 100644 (file)
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -97,7 +97,6 @@
 #define CONFIG_CHIP_SELECTS_PER_CTRL   4
 
 /* Serial Port */
-#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/ls1028a_common.h b/include/configs/ls1028a_common.h
index c191f74a3a61d90b722e33f75dfb3b76b2b6daac..d184673a71b52dd59051eda48737e3a74d851a00 100644 (file)
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -43,7 +43,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) / 2)

diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h
index 9b9218d29676af3f6d5cc0de65ff9cfd4b079e60..c6752f4acb721b8c570f7de25fe957c4f862bc2e 100644 (file)
--- a/include/configs/mt7628.h
+++ b/include/configs/mt7628.h
@@ -32,7 +32,6 @@
 #define CONFIG_SYS_NS16550_CLK         40000000
 #define CONFIG_SYS_NS16550_REG_SIZE    -4
 #define CONFIG_SYS_NS16550_COM1                0xb0000c00
-#define CONFIG_CONS_INDEX              1
 #endif
 
 /* Serial common */

diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h
index 460433cb00bf062eb558a8b627c1d2c8076ad020..82a8fa7354ee11c5f4dd2b4e50de4f43ef9f6bd3 100644 (file)
--- a/include/configs/vcoreiii.h
+++ b/include/configs/vcoreiii.h
@@ -34,8 +34,6 @@
 #error Unknown DDR size - please add!
 #endif
 
-#define CONFIG_CONS_INDEX              1
-
 #define CONFIG_SYS_MONITOR_BASE         CONFIG_SYS_TEXT_BASE
 
 #if defined(CONFIG_MTDIDS_DEFAULT) && defined(CONFIG_MTDPARTS_DEFAULT)

diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h
index 5aa3ad8ddf21e3d12496dab72d13ca917c074889..40467b737ceb0d053e69ec6f81a557903e986a50 100644 (file)
--- a/include/configs/vocore2.h
+++ b/include/configs/vocore2.h
@@ -34,7 +34,6 @@
 #define CONFIG_SYS_NS16550_CLK         40000000
 #define CONFIG_SYS_NS16550_REG_SIZE    -4
 #define CONFIG_SYS_NS16550_COM3                0xb0000e00
-#define CONFIG_CONS_INDEX              3
 
 /* RAM */
 

diff --git a/include/configs/x530.h b/include/configs/x530.h
index 7e0f2c24d943d8643760a3cdfa24c6f87171d399..4446510df4e0454283848e4640c8ab2c08aef959 100644 (file)
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -30,8 +30,6 @@
  * for your console driver.
  */
 
-#define CONFIG_CONS_INDEX      1       /*Console on UART0 */
-
 /* NAND */
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_MAX_NAND_DEVICE 1