[U-Boot] [PATCH v2 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig

This converts the following to Kconfig: CONFIG_SYS_CONSOLE_INFO_QUIET

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Make CONFIG_SYS_CONSOLE_INFO_QUIET the default if !CONFIG_MUX

README | 3 --- common/Kconfig | 9 +++++++++ configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/brppt1_mmc_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/brppt1_spi_defconfig | 1 + configs/brxre1_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebook_samus_defconfig | 1 + configs/chromebox_panther_defconfig | 1 + configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/coreboot-x86_defconfig | 1 + configs/cougarcanyon2_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/ea20_defconfig | 1 + configs/efi-x86_defconfig | 1 + configs/galileo_defconfig | 1 + configs/icon_defconfig | 1 + configs/lwmon5_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/qemu-x86_defconfig | 1 + configs/qemu-x86_efi_payload32_defconfig | 1 + configs/qemu-x86_efi_payload64_defconfig | 1 + configs/rpi_2_defconfig | 1 - configs/rpi_3_32b_defconfig | 1 - configs/rpi_3_defconfig | 1 - configs/rpi_defconfig | 1 - configs/rut_defconfig | 1 + configs/som-db5800-som-6867_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/theadorable_defconfig | 1 + include/configs/10m50_devboard.h | 1 - include/configs/3c120_devboard.h | 1 - include/configs/CPCI2DP.h | 2 -- include/configs/CPCI4052.h | 2 -- include/configs/M5249EVB.h | 1 - include/configs/MIP405.h | 1 - include/configs/MigoR.h | 2 -- include/configs/PIP405.h | 1 - include/configs/PLU405.h | 2 -- include/configs/PMC405DE.h | 1 - include/configs/VOM405.h | 2 -- include/configs/a3m071.h | 2 -- include/configs/amcc-common.h | 1 - include/configs/amcore.h | 1 - include/configs/ap325rxa.h | 1 - include/configs/ap_sh4a_4a.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/bur_cfg_common.h | 1 - include/configs/clearfog.h | 1 - include/configs/db-88f6720.h | 1 - include/configs/db-88f6820-amc.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/ea20.h | 1 - include/configs/ecovec.h | 1 - include/configs/hrcon.h | 2 -- include/configs/kzm9g.h | 1 - include/configs/lsxl.h | 1 - include/configs/lwmon5.h | 2 -- include/configs/maxbcm.h | 1 - include/configs/ms7722se.h | 1 - include/configs/odroid.h | 1 - include/configs/openrisc-generic.h | 1 - include/configs/origen.h | 1 - include/configs/r0p7734.h | 1 - include/configs/rcar-gen2-common.h | 1 - include/configs/rcar-gen3-common.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/sh7785lcr.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/socfpga_sr1500.h | 1 - include/configs/spear-common.h | 1 - include/configs/strider.h | 2 -- include/configs/theadorable.h | 1 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/trats.h | 1 - include/configs/trats2.h | 1 - include/configs/vct.h | 1 - include/configs/x600.h | 1 - include/configs/x86-common.h | 2 -- include/configs/xilinx-ppc.h | 1 - include/configs/xpress.h | 1 - scripts/config_whitelist.txt | 1 - 96 files changed, 41 insertions(+), 75 deletions(-)

diff --git a/README b/README index 752c8cb..a032e56 100644 --- a/README +++ b/README @@ -3582,9 +3582,6 @@ Configuration Settings: - CONFIG_SYS_BAUDRATE_TABLE: List of legal baudrate settings for this board.

-- CONFIG_SYS_CONSOLE_INFO_QUIET - Suppress display of console information at boot. - - 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 b64e797..4d27f09 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -326,6 +326,15 @@ config SYS_CONSOLE_ENV_OVERWRITE start-up (after relocation). This causes the environment to be updated to match the console devices actually chosen.

+config SYS_CONSOLE_INFO_QUIET + bool "Don't display the console devices on boot" + default y if !CONSOLE_MUX + help + Normally U-Boot displays the current settings for stdout, stdin + and stderr on boot when the post-relocation console is set up. + Enable this option to supress this output. It can be obtained by + calling stdio_print_current_devices() from board code. + endmenu

config SYS_NO_FLASH diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig index aa402bf..017e2e3 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405T=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig index 5caf3a2..f73b4d4 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig index 81f2820..ed6764a 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_PIP405=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 542e516..e720245 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -17,6 +17,7 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index 6a349ea..021fa62 100644 --- 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_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index eec3848..18fdcad 100644 --- 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_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index 07f7d35..6a63db5 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -17,6 +17,7 @@ CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=-2 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 4851003..afdb132 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_BOOTDELAY=-2 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 73afd13..b09b70a 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -12,6 +12,7 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index 6152393..015d357 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -11,6 +11,7 @@ CONFIG_HAVE_VGA_BIOS=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index 47cb553..1ec10e9 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -10,6 +10,7 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 560cf6c..9bb26c3 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -17,6 +17,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 4c2b20c..bd5e3a0 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index dc67744..4a8985d 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig index 2841eb6..18113f4 100644 --- a/configs/cougarcanyon2_defconfig +++ b/configs/cougarcanyon2_defconfig @@ -4,6 +4,7 @@ CONFIG_DEFAULT_DEVICE_TREE="cougarcanyon2" CONFIG_TARGET_COUGARCANYON2=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 9ec8b1d..7d4910b 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -10,6 +10,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 505f7d6..e079c3c 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig index 5bc6f04..3e9e731 100644 --- a/configs/ea20_defconfig +++ b/configs/ea20_defconfig @@ -5,6 +5,7 @@ CONFIG_VIDEO=y CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ea20 > " diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index 7c1ca1f..f2aa4cb 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -5,6 +5,7 @@ CONFIG_TARGET_EFI=y CONFIG_FIT=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTM is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index ecbf11b..db19e47 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -11,6 +11,7 @@ CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/icon_defconfig b/configs/icon_defconfig index a61753b..3a2a04c 100644 --- a/configs/icon_defconfig +++ b/configs/icon_defconfig @@ -4,6 +4,7 @@ CONFIG_4xx=y CONFIG_TARGET_ICON=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig index 317c8b6..0d9c814 100644 --- a/configs/lwmon5_defconfig +++ b/configs/lwmon5_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 9c5df0b..802e5b2 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -17,6 +17,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index bfac212..8aa512b 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -18,6 +18,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50" CONFIG_FIT=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 5277af3..6d52ca6 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -10,6 +10,7 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index 4a5e01f..f0d3169 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index ae8a9f1..ad18ecd 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index a97c910..f01dc30 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI_2=y CONFIG_OF_BOARD_SETUP=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index bbb1487..fa57de5 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -3,7 +3,6 @@ CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI_3_32B=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_OF_BOARD_SETUP=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index bdb37e0..16f4178 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -3,7 +3,6 @@ CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI_3=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_OF_BOARD_SETUP=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 5510833..2436e93 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI=y CONFIG_OF_BOARD_SETUP=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/rut_defconfig b/configs/rut_defconfig index eda5d7b..86c2859 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -18,6 +18,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="am335x-rut" CONFIG_FIT=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index 6c9d231..5f8081f 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 687b296..f965cb5 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index 51deddc..a400d6d 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -13,6 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig index 9c7a79f..61ba811 100644 --- a/configs/theadorable_defconfig +++ b/configs/theadorable_defconfig @@ -13,6 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index ebe018a..c79e89a 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -19,7 +19,6 @@ * SERIAL */ #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress console info */ #define CONFIG_SYS_NS16550_MEM32

/* diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index b2126a6..8835522 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -19,7 +19,6 @@ * SERIAL */ #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress console info */

/* * CFI Flash diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 603de33..ea65bd4 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -75,8 +75,6 @@

#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup*/ - #define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */

#define CONFIG_SYS_MEMTEST_START 0x0400000 /* memtest works on */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 06c5d3b..9ac2531 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -96,8 +96,6 @@

#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup*/ - #define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */

#define CONFIG_SYS_MEMTEST_START 0x0400000 /* memtest works on */ diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 735c4da..d61c68f 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */

#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup */ #define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 1a4d602..db92967 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -108,7 +108,6 @@ /*************************************************************** * defines if an overwrite_console function exists *************************************************************/ -#define CONFIG_SYS_CONSOLE_INFO_QUIET /*************************************************************** * defines if the overwrite_console should be stored in the * environment diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index b31d51b..bb12785 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -40,8 +40,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF0 1 -#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console - information at boot */

#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 5f7706df..1db7b5d 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -104,7 +104,6 @@ /*************************************************************** * defines if an overwrite_console function exists *************************************************************/ -#define CONFIG_SYS_CONSOLE_INFO_QUIET /*************************************************************** * defines if the overwrite_console should be stored in the * environment diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 391a697..ed05e21 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -93,8 +93,6 @@

#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup*/ - #define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */

#define CONFIG_SYS_MEMTEST_START 0x0400000 /* memtest works on */ diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 0b0db20..b076851 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -74,7 +74,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */

#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console info */

#define CONFIG_SYS_MEMTEST_START 0x0100000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x3000000 /* 1 ... 48 MB in DRAM */ diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 5e30511..5dbc1e8 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -83,8 +83,6 @@

#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup*/ - #define CONFIG_SYS_MEMTEST_START 0x0400000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x0C00000 /* 4 ... 12 MB in DRAM */

diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index f3e4f77..0e0fc27 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -248,8 +248,6 @@

#define CONFIG_SYS_LOAD_ADDR 0x00100000

-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/ - /* * Various low-level settings */ diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index f4261e9..7974c53 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -78,7 +78,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/

#define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 5667680..a209659 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -40,7 +40,6 @@ /* Boot argument buffer size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* no console @ startup */ #define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 153d162..9a4d2c9 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -55,7 +55,6 @@ #define CONFIG_CONS_SCIF5 1

/* Suppress display of console information at boot */ -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

#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 e922cdf..93205aa 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -71,7 +71,6 @@ #define CONFIG_CONS_SCIF4 1

/* Suppress display of console information at boot */ -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

/* SDRAM */ #define CONFIG_SYS_SDRAM_BASE (0x88000000) diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index e6761c3..817ddab 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -60,7 +60,6 @@ #define SCIF2_BASE 0xe6c60000 #define SCIF4_BASE 0xe6c80000 #define CONFIG_SCIF_A -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

#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 16237e6..5c99860 100644 --- a/include/configs/bur_cfg_common.h +++ b/include/configs/bur_cfg_common.h @@ -39,7 +39,6 @@ #define CONFIG_NETCONSOLE 1 #define CONFIG_BOOTP_MAY_FAIL /* if we don't have DHCP environment */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */

/* As stated above, the following choices are optional. */ diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 3990900..21b391b 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -87,7 +87,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif

-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST

/* Keep device tree and initrd in lower memory so the kernel can access them */ diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index a134889..282d5e8 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -50,7 +50,6 @@ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST

/* Additional FS support/configuration */ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index a6d0221..446596e 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -72,7 +72,6 @@ #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_ONFI_DETECTION

-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST

/* Keep device tree and initrd in lower memory so the kernel can access them */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 48b4b2e..1f2f6b8 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -88,7 +88,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif

-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST

/* Keep device tree and initrd in lower memory so the kernel can access them */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index c43dece..d81efa9 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -55,7 +55,6 @@ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST

/* SATA support */ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index c88eaa9..acb01c9 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -104,7 +104,6 @@ #define CONFIG_VIDEO_DA8XX #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_LOGO -#define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CMD_BMP diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index dd925a9..e1e3c78 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -91,7 +91,6 @@ #define CONFIG_CONS_SCIF0 1

/* Suppress display of console information at boot */ -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

/* SDRAM */ #define CONFIG_SYS_SDRAM_BASE (0x88000000) diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 99dcb75..c2ffc08 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -539,8 +539,6 @@ void fpga_control_clear(unsigned int bus, int pin);

#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET - /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 0aff6e8..b8f73d6 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -56,7 +56,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE #define CONFIG_CONS_SCIF4 -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

#define CONFIG_SYS_MEMTEST_START (KZM_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END \ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 6084c8e..0caca4c 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -36,7 +36,6 @@ #define CONFIG_KIRKWOOD_GPIO

#define CONFIG_SYS_NO_FLASH -#define CONFIG_SYS_CONSOLE_INFO_QUIET

/* * Enable u-boot API for standalone programs. diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 2fed3e0..638682f 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -426,8 +426,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/ - #ifndef DEBUG #define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */ #endif diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 29ed284..9f4308f 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -46,7 +46,6 @@ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST

/* diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 17485b5..a473eec 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -40,7 +40,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF0 1 -#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console information at boot */

#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/odroid.h b/include/configs/odroid.h index 704d1e7..2828f07 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -43,7 +43,6 @@ #define CONFIG_BAUDRATE 115200

/* Console configuration */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET

#define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run autoboot" diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h index 227c0ca..9decae7 100644 --- a/include/configs/openrisc-generic.h +++ b/include/configs/openrisc-generic.h @@ -38,7 +38,6 @@

#define CONFIG_BAUDRATE CONFIG_SYS_UART_BAUD #define CONFIG_SYS_BAUDRATE_TABLE {CONFIG_BAUDRATE} -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress console info */ #define CONSOLE_ARG "console=console=ttyS0,115200\0"

/* diff --git a/include/configs/origen.h b/include/configs/origen.h index a075b54..26fe402 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -37,7 +37,6 @@ #define CONFIG_BAUDRATE 115200

/* Console configuration */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"

#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */ diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index d7ecdb8..0552003 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -76,7 +76,6 @@ #define CONFIG_CONS_SCIF3 1

/* Suppress display of console information at boot */ -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

/* SDRAM */ #define CONFIG_SYS_SDRAM_BASE (0x88000000) diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index e02e2d1..2d5c638 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -42,7 +42,6 @@ #define CONFIG_SH_GPIO_PFC

/* console */ -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

#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 a397e64..29685ed 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -50,7 +50,6 @@ #define CONFIG_SH_GPIO_PFC

/* console */ -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index e2d814f..0210c5b 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -29,7 +29,6 @@ #define CONFIG_BAUDRATE 115200

/* Console configuration */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET

#define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run mmcboot" diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index bdb8101..38bf408 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -44,7 +44,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF2 1 -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

#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 eaa862c..3718bc5 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -44,7 +44,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF2 1 -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

#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 8e4ff1c..8820e15 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -44,7 +44,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF2 1 -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

#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 86057c1..11a4cf9 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -60,7 +60,6 @@ #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF1 1 #define CONFIG_SCIF_EXT_CLOCK 1 -#undef CONFIG_SYS_CONSOLE_INFO_QUIET

#define CONFIG_SYS_MEMTEST_START (SH7785LCR_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 96b8df0..6bd3c10 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -110,7 +110,6 @@

#define CONFIG_BAUDRATE 115200

-#define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_SERIAL1 1 #define CONFIG_CONS_INDEX 1

diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 286e746..0407f03 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -25,7 +25,6 @@ #define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */

/* Ethernet on SoC (EMAC) */ #define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index a6973c5..c201d0a 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -190,7 +190,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_LOAD_ADDR 0x00800000 -#define CONFIG_SYS_CONSOLE_INFO_QUIET

#define CONFIG_SYS_FLASH_EMPTY_INFO

diff --git a/include/configs/strider.h b/include/configs/strider.h index 5cd37d7..92ad95e 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -573,8 +573,6 @@ void fpga_control_clear(unsigned int bus, int pin);

#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET - /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index fe2ca6f..a51ffb5 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -63,7 +63,6 @@ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */

-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST #define CONFIG_PREBOOT

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 22a8e4f..e7f4fba 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -149,7 +149,6 @@

#define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_SYS_CONSOLE_INFO_QUIET

#define CONFIG_ENV_IS_NOWHERE

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index b3215a2..26998d7 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -114,7 +114,6 @@ #define CONFIG_SERIAL2 #define CONFIG_SERIAL3 #define CONFIG_CONS_INDEX 1 -#define CONFIG_SYS_CONSOLE_INFO_QUIET

#define CONFIG_ENV_IS_NOWHERE

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index d8a8c4a..3825935 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -151,7 +151,6 @@ #else #define CONFIG_SYS_MALLOC_LEN (16 << 20) #endif -#define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_BAUDRATE 115200 #define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */ #define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */ diff --git a/include/configs/trats.h b/include/configs/trats.h index 9fc6513..a26d663 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -41,7 +41,6 @@ #define CONFIG_BAUDRATE 115200

/* Console configuration */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET

/* MACH_TYPE_TRATS macro will be removed once added to mach-types */ #define MACH_TYPE_TRATS 3928 diff --git a/include/configs/trats2.h b/include/configs/trats2.h index c437c13..1633c67 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -38,7 +38,6 @@ #define CONFIG_BAUDRATE 115200

/* Console configuration */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET

#define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run autoboot" diff --git a/include/configs/vct.h b/include/configs/vct.h index 168902c..357733b 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -142,7 +142,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_TIMESTAMP /* Print image info with timestamp */ #define CONFIG_CMDLINE_EDITING /* add command line history */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/

/* * FLASH and environment organization diff --git a/include/configs/x600.h b/include/configs/x600.h index 9db4524..f433517 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -157,7 +157,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_LOAD_ADDR 0x00800000 -#define CONFIG_SYS_CONSOLE_INFO_QUIET

/* Use last 2 lwords in internal SRAM for bootcounter */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index ebb257b..7742020 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -84,8 +84,6 @@ #endif #define CONFIG_PARTITION_UUIDS

-#define CONFIG_SYS_CONSOLE_INFO_QUIET - /* x86 GPIOs are accessed through a PCI device */ #define CONFIG_INTEL_ICH6_GPIO

diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 6c52582..47c1ddf 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -57,7 +57,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) diff --git a/include/configs/xpress.h b/include/configs/xpress.h index dd28e6a..3ea588a 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -45,7 +45,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000

-#define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_CMDLINE_EDITING

/* Physical Memory Map */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5a2c6e3..b3401a3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4616,7 +4616,6 @@ CONFIG_SYS_CMXFCR_VALUE1 CONFIG_SYS_CMXFCR_VALUE2 CONFIG_SYS_CMXFCR_VALUE3 CONFIG_SYS_CMXSCR_VALUE -CONFIG_SYS_CONSOLE_INFO_QUIET CONFIG_SYS_CORE_SRAM CONFIG_SYS_CORE_SRAM_SIZE CONFIG_SYS_CORTEX_R4