serial: sh: Convert to Kconfig

Convert the SH Serial to Kconfig using tools/moveconfig.py tool and a bit of manual adjustment to cater for failed conversions. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
8 years ago · 03a38a3972
parent 7ee0283d05
commit 03a38a3972
71 changed files with 44 additions and 34 deletions
--- a/configs/MigoR_defconfig
+++ b/configs/MigoR_defconfig
@ -20,4 +20,5 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@ -25,6 +25,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/ap325rxa_defconfig
+++ b/configs/ap325rxa_defconfig
@ -24,4 +24,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/ap_sh4a_4a_defconfig
+++ b/configs/ap_sh4a_4a_defconfig
@ -23,4 +23,5 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@ -27,4 +27,5 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 # CONFIG_MMC is not set
+CONFIG_SCIF_CONSOLE=y
 CONFIG_OF_LIBFDT=y
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@ -21,3 +21,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
--- a/configs/ecovec_defconfig
+++ b/configs/ecovec_defconfig
@ -27,6 +27,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/espt_defconfig
+++ b/configs/espt_defconfig
@ -23,4 +23,5 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@ -25,6 +25,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@ -25,6 +25,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@ -14,5 +14,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 # CONFIG_FAT_WRITE is not set
 CONFIG_OF_LIBFDT=y
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@ -25,6 +25,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/mpr2_defconfig
+++ b/configs/mpr2_defconfig
@ -23,4 +23,5 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_MISC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/ms7720se_defconfig
+++ b/configs/ms7720se_defconfig
@ -27,3 +27,4 @@ CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SCIF_CONSOLE=y
--- a/configs/ms7722se_defconfig
+++ b/configs/ms7722se_defconfig
@ -23,4 +23,5 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_JFFS2=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/ms7750se_defconfig
+++ b/configs/ms7750se_defconfig
@ -24,4 +24,5 @@ CONFIG_BOOTDELAY=-1
 # CONFIG_CMD_MISC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@ -25,6 +25,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/r0p7734_defconfig
+++ b/configs/r0p7734_defconfig
@ -23,4 +23,5 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@ -12,4 +12,5 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_RTL8139=y
 CONFIG_PCI=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/r7780mp_defconfig
+++ b/configs/r7780mp_defconfig
@ -25,4 +25,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/r8a7795_salvator-x_defconfig
+++ b/configs/r8a7795_salvator-x_defconfig
@ -20,6 +20,7 @@ CONFIG_CLK_RENESAS=y
 CONFIG_SH_SDHI=y
 CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/r8a7795_ulcb_defconfig
+++ b/configs/r8a7795_ulcb_defconfig
@ -18,6 +18,7 @@ CONFIG_CLK_RENESAS=y
 CONFIG_SH_SDHI=y
 CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/r8a7796_salvator-x_defconfig
+++ b/configs/r8a7796_salvator-x_defconfig
@ -21,6 +21,7 @@ CONFIG_CLK_RENESAS=y
 CONFIG_SH_SDHI=y
 CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/r8a7796_ulcb_defconfig
+++ b/configs/r8a7796_ulcb_defconfig
@ -19,6 +19,7 @@ CONFIG_CLK_RENESAS=y
 CONFIG_SH_SDHI=y
 CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/rsk7203_defconfig
+++ b/configs/rsk7203_defconfig
@ -22,4 +22,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_MISC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/rsk7264_defconfig
+++ b/configs/rsk7264_defconfig
@ -3,4 +3,5 @@ CONFIG_TARGET_RSK7264=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/rsk7269_defconfig
+++ b/configs/rsk7269_defconfig
@ -3,4 +3,5 @@ CONFIG_TARGET_RSK7269=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/sh7752evb_defconfig
+++ b/configs/sh7752evb_defconfig
@ -32,4 +32,5 @@ CONFIG_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/sh7753evb_defconfig
+++ b/configs/sh7753evb_defconfig
@ -31,4 +31,5 @@ CONFIG_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@ -31,4 +31,5 @@ CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/sh7763rdp_defconfig
+++ b/configs/sh7763rdp_defconfig
@ -24,4 +24,5 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_JFFS2=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/sh7785lcr_32bit_defconfig
+++ b/configs/sh7785lcr_32bit_defconfig
@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/sh7785lcr_defconfig
+++ b/configs/sh7785lcr_defconfig
@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/shmin_defconfig
+++ b/configs/shmin_defconfig
@ -21,4 +21,5 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@ -25,6 +25,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@ -25,6 +25,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_BAUDRATE=38400
+CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@ -464,6 +464,14 @@ config SANDBOX_SERIAL
 	     -t raw		Raw mode, Ctrl-C is processed by U-Boot
 	     -t cooked		Cooked mode, Ctrl-C terminates

+config SCIF_CONSOLE
+	bool "Renesas SCIF UART support"
+	depends on SH || ARCH_RMOBILE
+	help
+	  Select this to enable Renesas SCIF UART. To operate serial ports
+	  on systems with RCar or SH SoCs, say Y to this option. If unsure,
+	  say N.
+
 config UNIPHIER_SERIAL
 	bool "Support for UniPhier on-chip UART"
 	depends on ARCH_UNIPHIER
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@ -37,7 +37,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1

 #define CONFIG_SYS_MEMTEST_START	(MIGO_R_SDRAM_BASE)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@ -37,7 +37,6 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE

 /* FLASH */
 #define CONFIG_SPI
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@ -47,7 +47,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 38400 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE 1
 #define CONFIG_SCIF_A		1 /* SH7723 has SCIF and SCIFA */
 #define CONFIG_CONS_SCIF5	1

--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@ -49,7 +49,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_SCIF			1
 #define CONFIG_CONS_SCIF4	1

--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@ -46,7 +46,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF1
 #define SCIF0_BASE		0xe6c40000
 #define SCIF1_BASE		0xe6c50000
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@ -28,7 +28,6 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF0

 #define CONFIG_SYS_MEMTEST_START	(RCAR_GEN2_SDRAM_BASE)
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@ -81,7 +81,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_SCIF		1
 #define CONFIG_CONS_SCIF0	1

--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@ -26,7 +26,6 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE		1
 #define CONFIG_CONS_SCIF0		1

 #define CONFIG_SYS_TEXT_BASE	0x8FFC0000
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@ -38,7 +38,6 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	0x20000000

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE

 /* FLASH */
 #define CONFIG_SPI
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@ -38,7 +38,6 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE

 /* FLASH */
 #define CONFIG_SPI
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@ -49,7 +49,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF4

 #define CONFIG_SYS_MEMTEST_START	(KZM_SDRAM_BASE)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@ -38,7 +38,6 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE

 /* SPI */
 #define CONFIG_SPI
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@ -64,7 +64,6 @@
 #define CONFIG_SYS_TMU_CLK_DIV		4	/* 4 (default), 16, 64, 256 or 1024 */

 /* UART */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1

 #endif	/* __MPR2_H */
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@ -38,7 +38,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1

 #define CONFIG_SYS_MEMTEST_START	MS7720SE_SDRAM_BASE
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@ -37,7 +37,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1

 #define CONFIG_SYS_MEMTEST_START	(MS7722SE_SDRAM_BASE)
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@ -20,7 +20,6 @@
 /*
 * Command line configuration.
 */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF1	1

 #define CONFIG_BOOTARGS		"console=ttySC0,38400"
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@ -38,7 +38,6 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(1024u * 1024 * 1024)

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE

 /* FLASH */
 #define CONFIG_SPI
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@ -54,7 +54,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_SCIF			1
 #define CONFIG_CONS_SCIF3	1

--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@ -15,7 +15,6 @@
 #define CONFIG_CMD_SH_ZIMAGEBOOT

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF1	1

 #define CONFIG_BOOTARGS		"console=ttySC0,115200"
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@ -23,7 +23,6 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_PCI

-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1

 #define CONFIG_BOOTARGS		"console=ttySC0,115200"
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@ -37,7 +37,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1

 #define CONFIG_SYS_MEMTEST_START	RSK7203_SDRAM_BASE
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@ -25,7 +25,6 @@
 #define CONFIG_SYS_MAXARGS	16	/* max args accepted for monitor commands */

 /* Serial */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF3	1

 /* Memory */
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@ -24,7 +24,6 @@
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */

 /* Serial */
-#define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF7

 /* Memory */
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@ -17,7 +17,6 @@
 #include "rcar-gen3-common.h"

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF2
 #define CONFIG_CONS_INDEX	2
 #define CONFIG_SH_SCIF_CLK_FREQ        CONFIG_S3D4_CLK_FREQ
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@ -35,7 +35,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF2	1

 #define CONFIG_SYS_MEMTEST_START	(SH7752EVB_SDRAM_BASE)
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@ -35,7 +35,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF2	1

 #define CONFIG_SYS_MEMTEST_START	(SH7753EVB_SDRAM_BASE)
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@ -36,7 +36,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF2	1

 #define CONFIG_SYS_MEMTEST_START	(SH7757LCR_SDRAM_BASE)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@ -26,7 +26,6 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE        1
 #define CONFIG_CONS_SCIF2		1

 #define CONFIG_SYS_TEXT_BASE	0x8FFC0000
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@ -53,7 +53,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF1	1
 #define CONFIG_SCIF_EXT_CLOCK	1

--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@ -41,7 +41,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600,14400,19200,38400,57600,115200 }

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1

 /* memory */
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@ -38,7 +38,6 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE

 /* FLASH */
 #define CONFIG_SPI
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@ -40,7 +40,6 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE
 #define CONFIG_SCIF_A

 /* SPI */
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@ -25,7 +25,6 @@
 #endif

 /* SCIF */
-#define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF2
 #define CONFIG_CONS_INDEX	2
 #define CONFIG_SH_SCIF_CLK_FREQ        CONFIG_S3D4_CLK_FREQ
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -2023,7 +2023,6 @@ CONFIG_SBC8641D
 CONFIG_SCF0403_LCD
 CONFIG_SCIF
 CONFIG_SCIF_A
-CONFIG_SCIF_CONSOLE
 CONFIG_SCIF_EXT_CLOCK
 CONFIG_SCIF_USE_EXT_CLK
 CONFIG_SCSI_AHCI