Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 5a892b33c7f7501dc8cfd98c13b5b3c8607c7b72..34f73c5f95d75bab4d1c712413963b8467eb0eec 100644 (file)
--- a/README
+++ b/README
@@ -3530,9 +3530,6 @@ Configuration Settings:
 - CONFIG_SYS_CONSOLE_INFO_QUIET
                Suppress display of console information at boot.
 
-- CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-               Enable the call to overwrite_console().
-
 - CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END:
                Begin and End addresses of the area used by the
                simple memory test.

diff --git a/common/Kconfig b/common/Kconfig
index e78e91829b5398cadc381495d6e5328860060577..69d09ec7628f3b063af46aeecbc553b9be028f22 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -309,6 +309,15 @@ config SYS_CONSOLE_IS_IN_ENV
          environment variables can be updated after boot to change the
          input/output devices.
 
+config SYS_CONSOLE_OVERWRITE_ROUTINE
+       bool "Allow board control over console overwriting"
+       help
+         If this is enabled, and the board-specific function
+         overwrite_console() returns 1, the stdin, stderr and stdout are
+         switched to the serial port, else the settings in the environment
+         are used. If this is not enabled, the console will not be switched
+         to serial.
+
 config SYS_CONSOLE_ENV_OVERWRITE
        bool "Update environment variables during console init"
        help

diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 9d31cf33b244eb31453490fd178630ffc9d59ad4..816b75757528605c2116fb66ea540b5e4d67f45b 100644 (file)
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405T=y
 CONFIG_BOOTDELAY=5
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y

diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index 3f8c33a04fbf7fda767d5a9aea319346bea78977..943ca7964580b301d12c2d60b9d59933cd62d59c 100644 (file)
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405=y
 CONFIG_BOOTDELAY=5
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y

diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 5df6fcd438afabae0c772cc2579b38a04331a352..98f4e227b213f43cce845141e7eed07457c20566 100644 (file)
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_PIP405=y
 CONFIG_BOOTDELAY=5
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y

diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index edabf926d64ae506cab143c0aad2728852f803c9..8cdd703ffc9cdd42d9dbd06fb44247725869bfab 100644 (file)
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
index 225a45a9ce48043fe6bd43ea27636afe6d091632..05e44aac70bb73a09ad36d07644ca6835e77998a 100644 (file)
--- a/configs/aristainetos2b_defconfig
+++ b/configs/aristainetos2b_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index 3106377fc7fd5781a0bd29002603a4cdb76eaf2f..175054c1a343a0c051401df0da720544da685fac 100644 (file)
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index d6f66b83d537dcbb2079bd7e6f8a7429c02713ba..d2a7d2507b4156ab438a98d3ff62c8a3e73146d3 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
 CONFIG_BOOTDELAY=-2
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 98e4a11520ce325ccc7ca28803067e6c7bf5c286..62f05347ebef975f91d53501860ce83f24ef7255 100644 (file)
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_BOOTDELAY=-2
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index dd084b5e07c2d2c9ada145114d5f9fa8be098138..d9980aec6aa399b35f99e95cd0b6ad42a2968e30 100644 (file)
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -17,6 +17,7 @@ CONFIG_SPI_BOOT=y
 CONFIG_BOOTDELAY=-2
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index 90c83b5df2035e9499b8e6c6041a6e396a99847f..c19ea36f0696a533d4ab63c1c594e5f57895fe31 100644 (file)
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_BOOTDELAY=-2
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index c951de5d6971ded03a762570a2a18eabfa04ffa3..c6ec3d1e203b4a7d8185d826cfdf974d90fc75a2 100644 (file)
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -17,6 +17,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "

diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index 8a10ba080a5992638b562e0cba3a79419cde3d2d..866586debe62410d59a0470c7e395e2042062f0c 100644 (file)
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -6,6 +6,7 @@ CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index e94faf541de193c1279a478de53e6e4b2c1b7fa4..e9b0fabf0de2fa7ec8c4cffcefad90195b6a59f5 100644 (file)
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 6a72555b793306b10e4f17c96ac5582161bdffc1..c295b55e85890f3a448231b6b729b7041a672c78 100644 (file)
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig
index 29010f3f7bb624d53d690c6c21d8ec39fa7a6689..117f68da8781d1f93515cfb300f28b4a0b0bd667 100644 (file)
--- a/configs/ge_b450v3_defconfig
+++ b/configs/ge_b450v3_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_GE_B450V3=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig
index e0eeb4663fb0779906c857a3c20616eb45af2cbe..73b559bee4f8a996b347ca99575c3c434fcf7073 100644 (file)
--- a/configs/ge_b650v3_defconfig
+++ b/configs/ge_b650v3_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_GE_B650V3=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig
index 9b4b91783400b4378ade34833de4dd60abbee29a..80d531564c1283f6d4fb7df2f556d40fccd10415 100644 (file)
--- a/configs/ge_b850v3_defconfig
+++ b/configs/ge_b850v3_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_GE_B850V3=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index 9b9f2252c4d0e9824ddfade929df5661a983a985..863fd7e821556f87592b5f6f5933b558d9010a2a 100644 (file)
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index 89282c2df053a4985c6b201e28577960432d6485..9ac4b65f6219a0e21d665543607e0ab01e8ea157 100644 (file)
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index 79b954f56a365ccb56d67a31ea5a05eeeaa544c8..a7a481363ead261be9955f37b073909ba70e8cb6 100644 (file)
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index 1013312c61166c93b5206ab6b532d05af4ab980e..b81b5ee93fcaa3b20a96622780f7f62c31cc226a 100644 (file)
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index 5ffb23b4492ecb69f44f72f02b11775ba5ccbb07..eb7ecdd1de22978a62b21506555a5c6d6d3e968b 100644 (file)
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
index a3562a93a6f6722e023c67426d46e292ba4f5002..8f2c8c51a8864fba899f42c08b5b94166ae84f19 100644 (file)
--- a/configs/mx6qpsabreauto_defconfig
+++ b/configs/mx6qpsabreauto_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 4f8b75c30d0e921906a99e8e74ffad45e6bddc17..2281522a8756dc9cc883cb5f1d95b4463ce6cb10 100644 (file)
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 93f7a61530455df74a5c904cf077ffc8cfbf3e42..53795d0fe876a879538cea09b98382b984edaf28 100644 (file)
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index c9ff394eeabefc83b8f85c1640847cec17cf077d..48c654b83946b4236a3bd9f32be9c277ef5e0e7f 100644 (file)
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index 3f836fffd6e34963daac869587f0784444a080db..be7309879eb741e0b7d3eb9ef6ae7e0529435fd0 100644 (file)
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -15,6 +15,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 1f50afa07b35aaad9f03d40c985a50e0aa9cf334..a6ccb92938c48bd2806ff968961cc72618658b68 100644 (file)
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index df064ca07b4fce4ac2872f84c5dbc4307f42c138..0558a08654893ae5bab367862ad1b83735de0e8d 100644 (file)
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 370d7488b2b1bfc57707ba59c83989179a187ca5..23cd772d6cb5ac36da7b3a5559cc6293154bb960 100644 (file)
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 7434a8ba47b8ab34da4d07340a5ee0683d81407d..b5f1ec48bb874d8c9a379434adf09a9e8d501609 100644 (file)
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index c2985a463bd087758bd51a5fede2a90e8be30a31..77bc9896d6cd99728390c5fa0936d4eec73dce1a 100644 (file)
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 781b5a55d19808e1db384e6a14c44b269018eda7..f536b84aa11fa4fc22c4ed92dbd5066e084c612d 100644 (file)
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index 608f5715aab35dcfbf831fa42887857f99a9f4cf..a29c2384f26939486f493465c92037c5a8de18c0 100644 (file)
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index 246ba00b1dfbc983c9906c6d17b9d91409843648..d91990c5e359287942f80be9753fdb51cbe731bc 100644 (file)
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index bc550e50347198e698190dbcd79ba76dc5547837..905f766278c3af12b73ec4dde6871d922ce4f668 100644 (file)
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
index 140ac4dbe6e878a6be1cb5140d754b87b0822c22..7daf81a5a3c78eb267688953743ac951c4bc056d 100644 (file)
--- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig
index 6a50f5b690836d4d0a5326827a56b82381eaf455..a0f04d0470778b09bdca2d65e200f67122a445b5 100644 (file)
--- a/configs/socfpga_is1_defconfig
+++ b/configs/socfpga_is1_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig
index cc0938d10dd184e0cf0829db1fad171c3d5fc429..5a5324681f3f75d9bdd0f730292899af5087772d 100644 (file)
--- a/configs/socfpga_mcvevk_defconfig
+++ b/configs/socfpga_mcvevk_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig
index a2088565754b41abc1ff0f66dc8ef4976263a693..9450d214f832327256ae2f05fb19eb2d369fd6eb 100644 (file)
--- a/configs/socfpga_sockit_defconfig
+++ b/configs/socfpga_sockit_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index b9e72c82db769ca7c88635dcc747eef6df8bbb0a..84a889035a5e119081397566ad131f1f822ee98a 100644 (file)
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
index 276682753fda444eed6d734575ff56e941f5704c..9cc2f7a2aa81743b74c352f59dbedec3f1c61c86 100644 (file)
--- a/configs/socfpga_sr1500_defconfig
+++ b/configs/socfpga_sr1500_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index c9b017890e7219b682fdec6d8d4b0746b6efbfe6..608cdf8ebbe58979dbb095822f4724eeed22a731 100644 (file)
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=5
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 3a38536cdb7d34203d152a70b3cc9e095fab8093..d338ffc49ba2b05553fd5a6001a98be9cc56331c 100644 (file)
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -14,6 +14,7 @@ CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 0cc8f3726e3c61cbb661ed2302f98a6ac63e469f..05e64ff3e690360d0254c035c923acb0608f8ce1 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -105,7 +105,6 @@
 /***************************************************************
  * defines if an overwrite_console function exists
  *************************************************************/
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 /***************************************************************
  * defines if the overwrite_console should be stored in the

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 588ddd4e26a7b5f278c0487f09f36728f60c46fe..b31d51bf15f73f2b9b9b264c4057c6edc83b9d7a 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -42,7 +42,6 @@
 #define CONFIG_CONS_SCIF0      1
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET  /* Suppress display of console
                                                                   information at boot */
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START       (MIGO_R_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index c9acb0259d7688d81bf5472ceb901a41d5945e8c..f6e43c845b4964bbaeacf74d5b274856d8d74cf6 100644 (file)
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -101,7 +101,6 @@
 /***************************************************************
  * defines if an overwrite_console function exists
  *************************************************************/
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 /***************************************************************
  * defines if the overwrite_console should be stored in the

diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 854c0c415195b2da76dff7d7818d19145ef5915d..2341e9729d1694fae35cb3cc4be44c42a6d79590 100644 (file)
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -273,7 +273,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 795a7d23ebbfbc9ea93320aa2b4a2f75a695fa75..153d162304cab9e04474c978f3479ce18df7e40d 100644 (file)
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -56,7 +56,6 @@
 
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START       (AP325RXA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index fc08d7b8549910241d18ed32b047d27b3a28133e..e922cdfdbfc9a9c9facd05344dc89b92853633bb 100644 (file)
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -72,7 +72,6 @@
 
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE  (0x88000000)

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 93083fc0549956a5f798e7d78d94b04800fc85a9..56530fd0720a9e2d6b369c8688563a6fd426d9fd 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -231,7 +231,6 @@
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 /* check this console not needed, after test remove it */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 3198df55555e60865636da52dfac6234133e883a..1d1dd39fe64450c6df01daf6a6225351e9b7ab47 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -59,7 +59,6 @@
 #define SCIF4_BASE             0xe6c80000
 #define        CONFIG_SCIF_A
 #undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START       (ARMADILLO_800EVA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \

diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index 277f36e8f3042ded7718921073adacf3690ac721..16237e61f77373efc3aa28e1e6c5495dfc4dc504 100644 (file)
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -41,7 +41,6 @@
 
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_ENV_OVERWRITE           /* Overwrite ethaddr / serial# */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* As stated above, the following choices are optional. */
 #define CONFIG_SYS_LONGHELP

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index b016f20a8d1ebbd3743248a191037b9c4dd85094..d474bc168cbed84a5399635329fdec7d03044633 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -89,7 +89,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 8c356887f15de4c635064d5ccdd073d25ed0d480..e3fdc5ec12c8e4ca1479cd9fde413356bb3e1378 100644 (file)
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -108,7 +108,6 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CMD_BMP
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #endif
 
 /*

diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 8ab26e6d7a89fb028391579427ce92e7543a996f..dd925a95bbe765db7db24b7065a04ed530a602fc 100644 (file)
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -92,7 +92,6 @@
 
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE  (0x88000000)

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 9e0c945c793019446413688ba948e8ddf3f7ee8b..2106e8640b9041b52f7ccbc8d9c8b04972fa2ac0 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -118,7 +118,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 44155e758d4ed3817235bba831085f25164b8568..ae3b1e4ac63f2042691914ef8f3e38972d02ba92 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -304,8 +304,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-
 /* Framebuffer */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 4ea9ba21e5daa99ce4971884b7c5303379f23579..b2d9394cda4fb5728f40aead10fac99dc2214783 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -55,7 +55,6 @@
 #define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF4
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START       (KZM_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END \

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index d0b6e5819d356acd523f78ff703353d9647be718..17485b59d0f8218940f29fd9e15611c7084db581 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -41,7 +41,6 @@
 #define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF0      1
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET                  /* Suppress display of console information at boot */
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START       (MS7722SE_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 664e2dd2522a1c9ea9cf198c4377e5b679c85310..3c1d53fdf8c791bee6af1d296307768becd185db 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -94,7 +94,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 2ee6d989b6f88246278a863622132d1f66a55c9f..6cc5d9c60a3caa5c3292702de6fa75f948f2577a 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -214,7 +214,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 9a0b0a2d2c0c4cd61151b1fee7a4e1fd7b9a5e18..e404d5bea7c968d9dc355ada12623a2d4ccc1896 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -209,7 +209,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 63ef4e7a2fc0ff207b86a005ab73d11f1ae9a05f..b32e49ed02080b880ba6df63209f57dabc06559a 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -93,7 +93,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index 408ae21ae1cf1d768524e8d90d795198daf02b24..d7ecdb82aef7d5eb805651723ce205361f3f65e6 100644 (file)
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -77,7 +77,6 @@
 
 /* Suppress display of console information at boot */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE  (0x88000000)

diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 1891242987555e123d1c4b4f0ba516db9b576f7c..9f92ff7c6b99c2603a8d00a6dd5ff0f8588c0bf4 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -41,7 +41,6 @@
 
 /* console */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE              256

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index cf1af6687ee783a103c5b81373e71df73d71131c..59934c0a21a1c23e1929c007dae392f544881717 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -49,7 +49,6 @@
 
 /* console */
 #undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE              256

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index fd32ddc9eee4610506b630247045e9a8d4bb375c..bdb81018c9470111ceb2dc0ab2f2fb07a16c32f9 100644 (file)
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -45,7 +45,6 @@
 #define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF2      1
 #undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START       (SH7752EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \

diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 57c8e769c0fa0f3cff734ffbec535df3d58d28ae..eaa862cf1e69ff06c604840f2de2a90180e8d4e1 100644 (file)
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -45,7 +45,6 @@
 #define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF2      1
 #undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START       (SH7753EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \

diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index cb09a7cca0d7a660b8a22ad2040d37e48767f4a1..8e4ff1c07b4ce7aba135f030fc84889d88d3e46e 100644 (file)
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -45,7 +45,6 @@
 #define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF2      1
 #undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START       (SH7757LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 6eee51ed8e6772441d63db7c1bc2790b51f322c7..86057c1f98030373e1a220316e96bca5e03520a4 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -61,7 +61,6 @@
 #define CONFIG_CONS_SCIF1      1
 #define CONFIG_SCIF_EXT_CLOCK  1
 #undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 #define CONFIG_SYS_MEMTEST_START       (SH7785LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index e76e072bb0f94149847f1714c055ab2687f38946..d37e5958b58689de116981529f8b37de9abc1c50 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -251,7 +251,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 /*
  * U-Boot environment
  */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #if !defined(CONFIG_ENV_SIZE)
 #define CONFIG_ENV_SIZE                        4096
 #endif

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index d089b53e88e9ce090582aec6a35c30c7210bcc57..8c5cf332fa96bb7e3541a7a9de8db959fc46fae1 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -75,7 +75,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8b49304551727b60290523780172fa6f84217805..43814cf20881f152d4398bc373c9f2f38cf98404 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4598,7 +4598,6 @@ CONFIG_SYS_CMXFCR_VALUE2
 CONFIG_SYS_CMXFCR_VALUE3
 CONFIG_SYS_CMXSCR_VALUE
 CONFIG_SYS_CONSOLE_INFO_QUIET
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 CONFIG_SYS_CORE_SRAM
 CONFIG_SYS_CORE_SRAM_SIZE
 CONFIG_SYS_CORTEX_R4