diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig
index 091045f6a34c291e393922aab9ab050cb5536ee3..b8e2da2678e36f139045dd3931f1b9d9c5b36a8f 100644
--- 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
diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 84f6f12b3e9dabcca656838501962dc7c32fa0a6..109b1abfe7b8ee3a4a97a77377fa123d67d9548a 100644
--- 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
diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig
index ebefe3cdb3291716d8325dc6069d7ff9519af558..8c1aaf2c3c3eb832d5f8a6c4f4e4348fe29802d4 100644
--- 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
diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig
index c08ae4f3eb7efef8ca2236af15dc4bb226d1fba8..400cfd10a755793041e73d8bf0af5f3b4761a9a3 100644
--- 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
diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index c5a652457ff6027848b300c6ca96a2e5035aa01c..8b2448b1fcf84969fbda611000850a9de47ae493 100644
--- 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
diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index ccd0d8f0da677a2b29904cfb72b0562abbf2ea92..c2a4c8092f17eacb1111b526d41958bf76f54f14 100644
--- 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
diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig
index 7fb14ab9de55bd03857b98c65511016185c5db6a..532b22d3be2490fc9efe4d00103f854c7b9ecd65 100644
--- 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
diff --git a/configs/espt_defconfig b/configs/espt_defconfig
index a7f50efc45991da778cfd70ef414a2bd8cf82d02..a41704ec967def787d7e5d6ab9406b4c51d498c9 100644
--- 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
diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index b579826fe4517b3ef7c4d368d4ee7845621cb25e..12b768ca392d8f5e6781c7867bda591fa6871764 100644
--- 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
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index a28326b456fed037d1c1f979b506ab98e36130cb..e6eef3f731448e59840639b42e26875a7320a6c8 100644
--- 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
diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index 0ee7f4bb80ad3d44fd73930de8b09b741dd59758..ac21f979b9eef0f32315cae5fc2394fa87ea9d64 100644
--- 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
diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index f4c4389075cd2cdabed90e1e3c34b3c6916e5b48..ca4f73d04f6f3b1e389d99ea82eb16d78a461cc7 100644
--- 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
diff --git a/configs/mpr2_defconfig b/configs/mpr2_defconfig
index ea3323700376bfcef90526044575bdd510a17cb1..efa0f7fe1c04d99ba2342ab3cbfbd721a5223628 100644
--- 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
diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig
index 30e52692d0e637561267525f53b756ba38785239..7f137fa911aaf96639cda69f75e43e177dfa567f 100644
--- 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
diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig
index 633a087616d8c350447d9f7a24b0a36ab77fade5..37cf8776c227d4f15bd312676a393329e4628f40 100644
--- 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
diff --git a/configs/ms7750se_defconfig b/configs/ms7750se_defconfig
index 9fabcd90598b2ae0dda4a182dbebb1e8a50ce836..402be860606a3383214c541ec8b38351c9c8d1cd 100644
--- 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
diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index d74a954615e349409e688aa9a874f921ad9a503a..e90fbf1137409c3590dcaf4945f9d204fb307f29 100644
--- 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
diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig
index a6f6a9324d7a599af60fb90a4f3730aef3981ace..91b36058bc7035c0d6f69debf148b3ad87317987 100644
--- 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
diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index 32a12720c97a0a21e3617d0c5b7d29c55e17002b..31b9cc4f5b6afb46eff64ffca548474a642ed604 100644
--- 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
diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig
index c5fa3f3b36e175867c08e777d5cc2659f0b0f649..a46954d3c31983fa9694d95f42bcd42c8cef4bc5 100644
--- 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
diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig
index bd64ae76c44f32a92ecb7626155cd6e8df8129b6..3d67ff41d21f8461c3b266efe111973f92cc6b10 100644
--- 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
diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
index ebe5cffab878500aba1a1f93ece94a4ecb1b1028..dfd5be1b352d3aa167b214390c619178d33b95e1 100644
--- 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
diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
index b408cb0e5cdb86c0b00e5bd4f2f22353c634ac01..1fd4505ad2de8ee33d782e9ef0c6d1b779c8b84e 100644
--- 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
diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
index d7c4cf3535a929d57314c95445487c5b83e4cb3e..b5443c0035ae2ad3773b75dcbb134f3a1c1b2ac0 100644
--- 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
diff --git a/configs/rsk7203_defconfig b/configs/rsk7203_defconfig
index 1aeb78aad14e63e01f29660c2bc24e1746dc5dd3..f7b99f484208dd7710c1495c5de592da6d7afeb7 100644
--- 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
diff --git a/configs/rsk7264_defconfig b/configs/rsk7264_defconfig
index b07e48c68be74e4b1294c0a68cff62e7996d33af..f1999b53e5140fb8fc40e6a69080fe1ed4c0639c 100644
--- 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
diff --git a/configs/rsk7269_defconfig b/configs/rsk7269_defconfig
index ed4fe21f9499b490dcd6384563cb94f578a9ad0f..4a07af618017dd6812d342579cdada9122642e19 100644
--- 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
diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig
index 1271ea03564420e8aa2a5f5f3e92e0fb58e3baeb..124757353bf41c8f85f6969eaf759993289bfee2 100644
--- 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
diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig
index 06a95bcde9ccbf02d78b17ee750e6e1446765e29..68e0c5cdfb59ca8ad9635a0a1586db83d7a88b7c 100644
--- 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
diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig
index 09ed1b3affd30eb4691326d0a45b6a5c8e42e0f5..d43c0184e462de58313dea99d3b2f104e1be4d6d 100644
--- 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
diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig
index 9334f6bdec43dca79013026ee348675b25ece7e0..32cc565b5e821e820cad7bd8bca390533ecbcc24 100644
--- 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
diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig
index 59e6067209f02963a9783269a30b93b38e14ff84..675c4eb678480d0494489217a95ea2c472dd8c5a 100644
--- 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
diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig
index cf9c305bc359db97b1cc5e5dfb8c8e82bf14894a..d118fd4f5d5c2fd51737a345928956fbcdc41886 100644
--- 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
diff --git a/configs/shmin_defconfig b/configs/shmin_defconfig
index dffff1187bd8402c21be8dcc35b1cff21ea9b806..249582f49588efa5cc60cd43d500a971f8adbb7c 100644
--- 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
diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index cf20114d3b349bc4f0af67bc2628c3d21aafbb3e..d2d20b9b96f6d12b2b92d19582272863e530ffab 100644
--- 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
diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index 063b33ca72f80637363e5e1ddb3d1d5538942b7e..bee7401d7994ac7f3c1f1f48ff0b927fb263bb09 100644
--- 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
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 2582c954f2a01a538cef3922fd8e45ca7b4039dc..a8e997834ad21a5b81a7e40945bbc85c5e773b7f 100644
--- 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
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 5ee83b903464f923259b83bcc5cf8e5ef28d9f9d..73b0e6e05a816c13bc81deeae42a71836e5e8548 100644
--- 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)
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 16525087f1886996be53eb949d10dd488ae35ba7..a61814ef009d2e8f4443e29d6ea231c3434b74d5 100644
--- 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
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 285041dbf830d05662735b5fbee200de6aca55fb..448c9279a9d4ab953193e2824cf96dca15cefa14 100644
--- 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
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index 078c77bf68ce7d20c3ecda3f42b9282ff6014699..adc7d1feba9b1131837ace3b1726aec13061382b 100644
--- 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
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 492062abb351c5ff38b56c42d574cd65c3e0e295..643b26b4880ae8675ff366cc956c5125fd0d0e11 100644
--- 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
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 9a18046d9ce76ca37d2a435184ed1e8e8cf1cd8c..cdff96685b4aba4a76c135f1a0f768bdb2027845 100755
--- 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)
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index cabbe160a37efc49cc8c0299d0836f88b175d040..2471277c68b8725f93504a053778688862b2fdc5 100644
--- 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
diff --git a/include/configs/espt.h b/include/configs/espt.h
index 1b3295346d8f2b9a4347021edc375a7d6d871d17..07f327532ba04267ee1d8867cd642912f6201ebc 100644
--- 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
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 8a1d6d3407ff05f2a413eea6cd7e928c37654700..067e86d41cf0ffb08b1f7efc14d11f6ba5e78423 100644
--- 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
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 2166e2c8f2375670b236b264c9c5c9003426ce5f..988b747cbc93a4ff0fc1f42567d29cd0e494b2cc 100644
--- 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
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index f4349913143ce4869e1c30fb825770244c38e5b9..6f60c7c2c307a04093dc3f4a7faa2bcea5cb3824 100644
--- 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)
diff --git a/include/configs/lager.h b/include/configs/lager.h
index bf1352d941e3f9420f8ec3d0e8a632e87c4236c6..73ea9ac828df7b08f035e8eb064a762963bc42f6 100644
--- 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
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 5b37277cceabb26d7f2de7a56b98ca188fae1d21..30395d5b7e6e4301c8d211337912a6ad54061997 100644
--- 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 */
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 850a8cc22264b8c465f1f131af8196c3ccb88551..86b93a39bb151dd9808b257a65f6f665ce07044f 100644
--- 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
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index f456bf62931fe9a6eadc6f30455f43ab668b5fe8..49eadd10e99eef063f72b525afa44465560962d2 100644
--- 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)
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 8ea431efdc191789e86033a33fd4ff6b96abc98b..497b8c785fc103ea0b422a62b18db2db9ad9bb35 100644
--- 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"
diff --git a/include/configs/porter.h b/include/configs/porter.h
index ac21411178e39db11ebbaccb23ca63d43d2aa15f..fa1fff98296e8cf932c287c9a0d5aac9da80d49f 100644
--- 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
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index 5f74b2a0e08282a938c09b4ed77b1b5f9434aa2d..d79aa21c9e6feff4d99a89d4500cf17beb40ebf4 100644
--- 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
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 64fd4b97a0609029dd85845ca68b345416f0e7ac..7f1f115ff6ec800cfdbec3abe23445f1493b33a5 100644
--- 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"
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index c5f577a3bfbccc7a01aeb5f737b01f425667d16a..14390e81fbc267c866c697a80bc7cbdc0ef01ce9 100644
--- 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"
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index 8f30aefc41f86fdf0f3d5ef75c7898e478951036..58aadbef0154afdac98c9ff05080ee2a2c0a575a 100644
--- 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
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 14e55c579d47b506c85b5f6f739623018e4e46b0..f2e82f7daaf9d04b7d9e25af6731b6668031a8bc 100644
--- 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 */
diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 60844ab738d59c13eb2514c7121c6bfc595105b9..5dc87a63d7f01b631c32712c555c34543b2323c5 100644
--- 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 */
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 7f81063d13be5d3d01fa89e6b32e376cefefc801..f8bfe96781e57ebdcf22a52153e6b80b193d8987 100644
--- 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
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 46d0f2aede933d2e07cb8db056547ee8f963b9fb..39e8244b2524bc6ddbff8dbb5ed22a27bf7974d7 100644
--- 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)
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index aa8d05c2210095d3f5001a83212d28760c0c757c..24ec0768afa1c46947e9047e282cfb2ccc102abe 100644
--- 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)
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 1759a6f5d9ebf1f59a23222f4eed400b4a8fa93f..e5084adfccb0eff11b03b2ad7835b0e6a52098b2 100644
--- 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)
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 50a0e3e7d1fd20b8c8aaf7106ccd9d3ad2863e62..74bd9fc29ab2fbf6230ff65fe76b07e39cf932e7 100644
--- 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
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 59fcad03098449471178c084db50dcc42f5888cd..48a77197fd9e5baf9756f36ec2f1a9cbbae0d1bc 100644
--- 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
diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index c9718f9b36ed97be1f855bbd912dda873b66ba7f..d31dc558b1ffac36bb6ba79d55416a781a3e175d 100644
--- 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 */
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 84108fd523541861652cec70e78ccebaed582149..238783b4c44514654aa3b041ae2b86910aec1fc4 100644
--- 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
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 16f3ce86474c3506a0290a7aa49bee442580cfce..3b8806d065f6671d5a92148411b66dc3b669c326 100644
--- 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 */
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index 857fc9f8cf379b411428d6a96b5cfba01e4c37b0..921b9e5ec66ee68b4ae25cc20394b4c82d3d3f4a 100644
--- 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
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e630314926a71d4586ebe572563f003084979bc4..3b5c17a9825dcf2f31a9a3479694e0dcfe16a6da 100644
--- 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