Applied, thanks!
2017-07-22 6:18 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> 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+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> configs/MigoR_defconfig | 1 +
> configs/alt_defconfig | 1 +
> configs/ap325rxa_defconfig | 1 +
> configs/ap_sh4a_4a_defconfig | 1 +
> configs/armadillo-800eva_defconfig | 1 +
> configs/blanche_defconfig | 1 +
> configs/ecovec_defconfig | 1 +
> configs/espt_defconfig | 1 +
> configs/gose_defconfig | 1 +
> configs/koelsch_defconfig | 1 +
> configs/kzm9g_defconfig | 1 +
> configs/lager_defconfig | 1 +
> configs/mpr2_defconfig | 1 +
> configs/ms7720se_defconfig | 1 +
> configs/ms7722se_defconfig | 1 +
> configs/ms7750se_defconfig | 1 +
> configs/porter_defconfig | 1 +
> configs/r0p7734_defconfig | 1 +
> configs/r2dplus_defconfig | 1 +
> configs/r7780mp_defconfig | 1 +
> configs/r8a7795_salvator-x_defconfig | 1 +
> configs/r8a7795_ulcb_defconfig | 1 +
> configs/r8a7796_salvator-x_defconfig | 1 +
> configs/r8a7796_ulcb_defconfig | 1 +
> configs/rsk7203_defconfig | 1 +
> configs/rsk7264_defconfig | 1 +
> configs/rsk7269_defconfig | 1 +
> configs/sh7752evb_defconfig | 1 +
> configs/sh7753evb_defconfig | 1 +
> configs/sh7757lcr_defconfig | 1 +
> configs/sh7763rdp_defconfig | 1 +
> configs/sh7785lcr_32bit_defconfig | 1 +
> configs/sh7785lcr_defconfig | 1 +
> configs/shmin_defconfig | 1 +
> configs/silk_defconfig | 1 +
> configs/stout_defconfig | 1 +
> drivers/serial/Kconfig | 8 ++++++++
> include/configs/MigoR.h | 1 -
> include/configs/alt.h | 1 -
> include/configs/ap325rxa.h | 1 -
> include/configs/ap_sh4a_4a.h | 1 -
> include/configs/armadillo-800eva.h | 1 -
> include/configs/blanche.h | 1 -
> include/configs/ecovec.h | 1 -
> include/configs/espt.h | 1 -
> include/configs/gose.h | 1 -
> include/configs/koelsch.h | 1 -
> include/configs/kzm9g.h | 1 -
> include/configs/lager.h | 1 -
> include/configs/mpr2.h | 1 -
> include/configs/ms7720se.h | 1 -
> include/configs/ms7722se.h | 1 -
> include/configs/ms7750se.h | 1 -
> include/configs/porter.h | 1 -
> include/configs/r0p7734.h | 1 -
> include/configs/r2dplus.h | 1 -
> include/configs/r7780mp.h | 1 -
> include/configs/rsk7203.h | 1 -
> include/configs/rsk7264.h | 1 -
> include/configs/rsk7269.h | 1 -
> include/configs/salvator-x.h | 1 -
> include/configs/sh7752evb.h | 1 -
> include/configs/sh7753evb.h | 1 -
> include/configs/sh7757lcr.h | 1 -
> include/configs/sh7763rdp.h | 1 -
> include/configs/sh7785lcr.h | 1 -
> include/configs/shmin.h | 1 -
> include/configs/silk.h | 1 -
> include/configs/stout.h | 1 -
> include/configs/ulcb.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 71 files changed, 44 insertions(+), 34 deletions(-)
>
> diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig
> index f09794e13c..b7ae01c69a 100644
> --- a/configs/MigoR_defconfig
> +++ b/configs/MigoR_defconfig
> @@ -19,4 +19,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 04dda72532..95955d36db 100644
> --- a/configs/alt_defconfig
> +++ b/configs/alt_defconfig
> @@ -24,6 +24,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 ebefd126a8..394d263d3a 100644
> --- a/configs/ap325rxa_defconfig
> +++ b/configs/ap325rxa_defconfig
> @@ -23,4 +23,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 41c8be9120..ccea9aa80e 100644
> --- a/configs/ap_sh4a_4a_defconfig
> +++ b/configs/ap_sh4a_4a_defconfig
> @@ -22,4 +22,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 4c16ec19fd..ba67d4ddb1 100644
> --- a/configs/armadillo-800eva_defconfig
> +++ b/configs/armadillo-800eva_defconfig
> @@ -26,4 +26,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 bf7700cbe1..d0e12059f5 100644
> --- a/configs/blanche_defconfig
> +++ b/configs/blanche_defconfig
> @@ -20,3 +20,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 cc172f5181..6f818c6d27 100644
> --- a/configs/ecovec_defconfig
> +++ b/configs/ecovec_defconfig
> @@ -26,6 +26,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 a6a7af9755..addc293861 100644
> --- a/configs/espt_defconfig
> +++ b/configs/espt_defconfig
> @@ -22,4 +22,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 5627a18631..40ec59a6c2 100644
> --- a/configs/gose_defconfig
> +++ b/configs/gose_defconfig
> @@ -24,6 +24,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 465a6be8e7..5592f81370 100644
> --- a/configs/koelsch_defconfig
> +++ b/configs/koelsch_defconfig
> @@ -24,6 +24,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 a884e5a10c..80064fccec 100644
> --- a/configs/kzm9g_defconfig
> +++ b/configs/kzm9g_defconfig
> @@ -13,5 +13,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 c2f216bd51..6072990bc4 100644
> --- a/configs/lager_defconfig
> +++ b/configs/lager_defconfig
> @@ -24,6 +24,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 ea33237003..efa0f7fe1c 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 30e52692d0..7f137fa911 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 92f3158dae..db370e2a55 100644
> --- a/configs/ms7722se_defconfig
> +++ b/configs/ms7722se_defconfig
> @@ -22,4 +22,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 88bbb12003..512341168e 100644
> --- a/configs/ms7750se_defconfig
> +++ b/configs/ms7750se_defconfig
> @@ -23,4 +23,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 a50d9ed99b..42367afaa7 100644
> --- a/configs/porter_defconfig
> +++ b/configs/porter_defconfig
> @@ -24,6 +24,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 91b08dc24f..5133a0344e 100644
> --- a/configs/r0p7734_defconfig
> +++ b/configs/r0p7734_defconfig
> @@ -22,4 +22,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 ba68b504d0..4b1b9618b1 100644
> --- a/configs/r2dplus_defconfig
> +++ b/configs/r2dplus_defconfig
> @@ -11,4 +11,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 2a37db824d..02d237aca1 100644
> --- a/configs/r7780mp_defconfig
> +++ b/configs/r7780mp_defconfig
> @@ -24,4 +24,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 e50e457b35..74b836e8f9 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_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/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index ebe5cffab8..dfd5be1b35 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 062882c667..3358cae66d 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_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/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index d7c4cf3535..b5443c0035 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 1aeb78aad1..f7b99f4842 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 b07e48c68b..f1999b53e5 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 ed4fe21f94..4a07af6180 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 4e19243f0d..bafaa4315a 100644
> --- a/configs/sh7752evb_defconfig
> +++ b/configs/sh7752evb_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/sh7753evb_defconfig b/configs/sh7753evb_defconfig
> index 23b7d7df48..1256b5a0ed 100644
> --- a/configs/sh7753evb_defconfig
> +++ b/configs/sh7753evb_defconfig
> @@ -30,4 +30,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 44224e1e43..19e6dd6fb1 100644
> --- a/configs/sh7757lcr_defconfig
> +++ b/configs/sh7757lcr_defconfig
> @@ -30,4 +30,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 028616666c..500b17a760 100644
> --- a/configs/sh7763rdp_defconfig
> +++ b/configs/sh7763rdp_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/sh7785lcr_32bit_defconfig
> b/configs/sh7785lcr_32bit_defconfig
> index 8cb58e9d18..8e250ef323 100644
> --- a/configs/sh7785lcr_32bit_defconfig
> +++ b/configs/sh7785lcr_32bit_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/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig
> index 5b6ebf8528..2a5f34b1f7 100644
> --- a/configs/sh7785lcr_defconfig
> +++ b/configs/sh7785lcr_defconfig
> @@ -25,6 +25,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 dffff1187b..249582f495 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 d161c3bb88..e2d07c2467 100644
> --- a/configs/silk_defconfig
> +++ b/configs/silk_defconfig
> @@ -24,6 +24,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 48989aaea6..e52f9dd6ac 100644
> --- a/configs/stout_defconfig
> +++ b/configs/stout_defconfig
> @@ -24,6 +24,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 97cef7edbd..5883d8fa25 100644
> --- a/drivers/serial/Kconfig
> +++ b/drivers/serial/Kconfig
> @@ -454,6 +454,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 7217426d3a..d2b8e63fb9 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 16525087f1..a61814ef00 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 b3c22cf4a4..bddbe00795 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 440505dd1f..447bf8982a 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 2023895c3e..c614cb34d2 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 cb80b90381..c8c3151617 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 2404441860..77f6a29774 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 845bcc1c9a..e24022aa2b 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 8a1d6d3407..067e86d41c 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 2166e2c8f2..988b747cbc 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 feb3eec446..df3379d672 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 bf1352d941..73ea9ac828 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 df8ffe29d0..b5c8e7206f 100644
> --- a/include/configs/mpr2.h
> +++ b/include/configs/mpr2.h
> @@ -65,7 +65,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 2855c00723..39ea2e8981 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 de6e58a71e..06ae8fa400 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 394ce6cd38..fc89546349 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 ac21411178..fa1fff9829 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 6212dbae21..b9bc188b2f 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 744d567805..ac9482b199 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 bb79a9ffea..895f709741 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 8dc839df96..010b1aac11 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 cc709097c0..9e6523b0a5 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 12812f9a34..6ca443c469 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 0ac3900326..a729b9c880 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 3342a2966c..fcc7cb67f8 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 78670422f7..dea2822c99 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 e9cd3d749a..135d3c4e94 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 2186f21f7a..0a06a246d2 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 ab30428063..e719d7e1c5 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 995f76a1ea..bc72233174 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 84108fd523..238783b4c4 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 16f3ce8647..3b8806d065 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 857fc9f8cf..921b9e5ec6 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 baf87996a8..8fed0dd042 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -2035,7 +2035,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
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
