From patchwork Tue Jun 16 23:06:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 242538 List-Id: U-Boot discussion From: trini at konsulko.com (Tom Rini) Date: Tue, 16 Jun 2020 19:06:21 -0400 Subject: [PATCHv2 21/31] Convert CONFIG_CONS_INDEX to Kconfig In-Reply-To: <20200616230631.29189-1-trini@konsulko.com> References: <20200616230631.29189-1-trini@konsulko.com> Message-ID: <20200616230631.29189-21-trini@konsulko.com> This converts the following to Kconfig: CONFIG_CONS_INDEX Signed-off-by: Tom Rini --- configs/am43xx_evm_defconfig | 1 - configs/am43xx_evm_qspiboot_defconfig | 2 +- configs/am43xx_evm_rtconly_defconfig | 1 - configs/am43xx_evm_usbhost_boot_defconfig | 1 - configs/am43xx_hs_evm_defconfig | 1 - configs/birdland_bav335a_defconfig | 1 - configs/birdland_bav335b_defconfig | 1 - configs/gardena-smart-gateway-mt7688_defconfig | 1 + configs/linkit-smart-7688_defconfig | 2 ++ configs/ls1028aqds_tfa_lpuart_defconfig | 1 + configs/mscc_jr2_defconfig | 1 + configs/mscc_luton_defconfig | 1 + configs/mscc_ocelot_defconfig | 1 + configs/mscc_serval_defconfig | 1 + configs/mscc_servalt_defconfig | 1 + configs/mt7628_rfb_defconfig | 1 - configs/x530_defconfig | 1 + include/configs/SBx81LIFKW.h | 2 -- include/configs/SBx81LIFXCAT.h | 2 -- include/configs/brsmarc1.h | 2 -- include/configs/db-88f6281-bp.h | 7 ------- include/configs/gardena-smart-gateway-mt7688.h | 1 - include/configs/linkit-smart-7688.h | 1 - include/configs/ls1021atsn.h | 1 - include/configs/ls1028a_common.h | 1 - include/configs/mt7628.h | 1 - include/configs/vcoreiii.h | 2 -- include/configs/vocore2.h | 1 - include/configs/x530.h | 2 -- 29 files changed, 11 insertions(+), 31 deletions(-) diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index df02489b3b6e..be88f28e9e3d 100644 --- 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 459096db4f55..fea5aa01745a 100644 --- 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 66fe74407f12..8f1e60fd3e5d 100644 --- 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 d1a6fbe75387..7afd328a4983 100644 --- 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 deaa19007fae..79a0466b5ac2 100644 --- 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 2eb03ff67cc3..a20798be5443 100644 --- 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 851d6fddafa5..f5d7e3f50a11 100644 --- 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 41496f739bda..610609091910 100644 --- 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 8ec66938cdce..9115bb9d885f 100644 --- 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 e0348279d9f9..f3475b558a50 100644 --- 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 d9173f408666..aaede4a70b93 100644 --- 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 d5639016958d..0846ee84741b 100644 --- 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 a0e04bd4c749..36ca158715ba 100644 --- 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 1c86c0dca39b..66d9e1d315aa 100644 --- 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 91347682eef3..1f56875b5feb 100644 --- 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 f444cf98c6ce..ba3b06263f22 100644 --- 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 de077cb71fde..2f1fd755fb36 100644 --- 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 8f31fc4c7456..ec0c531c4623 100644 --- 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 f4440e576466..90480520ab3f 100644 --- 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 acf13b830a2e..d0cc08baa635 100644 --- 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 e234b0bf9826..06a7091be208 100644 --- 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 261749db8d34..1b26466eda30 100644 --- 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 d7ebfeda4c56..e7a7ae319897 100644 --- 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 ec2ed7c60969..e76e54e97fc9 100644 --- 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 c191f74a3a61..d184673a71b5 100644 --- 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 9b9218d29676..c6752f4acb72 100644 --- 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 460433cb00bf..82a8fa7354ee 100644 --- 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 5aa3ad8ddf21..40467b737ceb 100644 --- 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 7e0f2c24d943..4446510df4e0 100644 --- 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