Skip to contentSkip to conversation

Kconfig: Move console options to Kconfig

PATCH Superseded Simon Glass 4 participants 66 messages Sep 29, 2016 – Oct 13, 2016 Page 1 of 2

Subsystems (13)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover Kconfig: Move console options to Kconfig

This series moves a number of console-related CONFIG options to Kconfig. Those that are not currently used are removed.

A few unused video drivers are also removed and there are a few minor adjustments to improve the code. But mostly this follows the output of the moveconfig tool.

It is build-tested to check that everything still works. The series is available at u-boot-dm/video-working

$ buildman -b video --step 0 -su
boards.cfg is up to date. Nothing to do.
Summary of 2 commits for 1213 boards (32 threads, 1 job per thread)
01: Merge git://www.denx.de/git/u-boot-ppc4xx
  blackfin:  +   cm-bf527 bf609-ezkit bf537-stamp
     sparc:  +   grsim grsim_leon2 gr_cpci_ax2000 gr_xc3s_1500 gr_ep2s60
   sandbox:  +   sandbox_spl
       arc:  ?   nsim_700be nsim_hs38be tb100 axs101 axs103 nsim_700 nsim_hs38
     nios2:  +   10m50 3c120
microblaze:  +   microblaze-generic
  openrisc:  +   openrisc-generic
31: Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig
       arc:  ?   nsim_700be nsim_hs38be tb100 axs101 axs103 nsim_700 nsim_hs38

Changes in v3:
- Make SYS_CONSOLE_IS_IN_ENV default to y if CONSOLE_MUX is enabled
- Change CONFIG_CFB_CONSOLE to default y if CONFIG_VIDEO

Changes in v2:
- Drop the changes to Kconfig defaults
- Change CONFIG_PRE_CON_BUF_SZ default to 4096
- Change CONFIG_PRE_CON_BUF_SZ to 'int' type
- Drop the depend clause on the CONFIG_PRE_CON_BUF_SZ default
- Move CONFIG_PRE_CON_BUF_ADDR default to common/Kconfig
- Make CONFIG_SYS_CONSOLE_INFO_QUIET the default if !CONFIG_MUX
- Add new patch to convert CONFIG_USB_KEYBOARD to Kconfig
- Make CONFIG_SYS_STDIO_DEREGISTER the default if USB_KEYBOARD
- Drop Kconfig changes

Simon Glass (29):
Remove some merge markers
Convert SILENT_CONSOLE options to Kconfig
Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al to Kconfig
config: Drop CONFIG_CONSOLE
config: Drop CONFIG_CONSOLE_DEV
Convert CONFIG_VIDEO to Kconfig
Convert CONFIG_CFB_CONSOLE to Kconfig
Convert CONFIG_CFB_CONSOLE_ANSI to Kconfig Convert CONFIG_VIDEO_CT69000 to Kconfig
Convert CONFIG_SYS_CONSOLE_BG_COL et al to Kconfig
video: Drop the smiLynxEM driver
video: Drop the imx25lcdc driver
video: Drop the s3c-fb driver
video: Drop the sed13806 driver
Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig
video: Drop CONFIG_VIDEO_HW_CURSOR
Convert CONFIG_VIDEO_SW_CURSOR to Kconfig
video: Drop CONFIG_VIDEO_SW_CURSOR
Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig
video: Move video_get_info_str() prototype to a header file
video: Drop CONFIG_CONSOLE_INFO_QUIET
Convert CONFIG_LCD to Kconfig
Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE to Kconfig Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to Kconfig Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig Convert CONFIG_USB_KEYBOARD to Kconfig
Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig

 README                                             | 131 ----
 board/liebherr/lwmon5/lwmon5.c                     |   1 +
 board/mosaixtech/icon/icon.c                       |   1 +
 board/mpl/common/common_util.c                     |   1 +
 board/sunxi/Kconfig                                |   3 +
 board/tqc/tqm5200/tqm5200.c                        |   1 +
 common/Kconfig                                     | 144 ++++
 common/console.c                                   |   6 +-
 common/stdio.c                                     |   6 +-
 common/usb_kbd.c                                   |   2 +-
 configs/B4420QDS_NAND_defconfig                    |   1 +
 configs/B4420QDS_SPIFLASH_defconfig                |   1 +
 configs/B4420QDS_defconfig                         |   1 +
 configs/B4860QDS_NAND_defconfig                    |   1 +
 configs/B4860QDS_SECURE_BOOT_defconfig             |   1 +
 configs/B4860QDS_SPIFLASH_defconfig                |   1 +
 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig          |   1 +
 configs/B4860QDS_defconfig                         |   1 +
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig        |   1 +
 configs/BSC9131RDB_NAND_defconfig                  |   1 +
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig    |   1 +
 configs/BSC9131RDB_SPIFLASH_defconfig              |   1 +
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |   1 +
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig        |   1 +
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |   1 +
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig        |   1 +
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig  |   1 +
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig         |   1 +
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig  |   1 +
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig         |   1 +
 .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |   1 +
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig      |   1 +
 .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |   1 +
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig      |   1 +
 .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |   1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig    |   1 +
 .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |   1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig    |   1 +
 configs/C29XPCIE_NAND_defconfig                    |   1 +
 configs/C29XPCIE_NOR_SECBOOT_defconfig             |   1 +
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig        |   1 +
 configs/C29XPCIE_SPIFLASH_defconfig                |   1 +
 configs/C29XPCIE_defconfig                         |   1 +
 configs/Chuwi_V7_CW0825_defconfig                  |   1 +
 configs/Cubietruck_plus_defconfig                  |   1 +
 configs/Cyrus_P5020_defconfig                      |   2 +
 configs/Cyrus_P5040_defconfig                      |   2 +
 configs/MIP405T_defconfig                          |   6 +
 configs/MIP405_defconfig                           |   7 +
 configs/MPC8536DS_36BIT_defconfig                  |   1 +
 configs/MPC8536DS_SDCARD_defconfig                 |   1 +
 configs/MPC8536DS_SPIFLASH_defconfig               |   1 +
 configs/MPC8536DS_defconfig                        |   1 +
 configs/MPC8544DS_defconfig                        |   1 +
 configs/MPC8572DS_36BIT_defconfig                  |   1 +
 configs/MPC8572DS_defconfig                        |   1 +
 configs/MPC8610HPCD_defconfig                      |   2 +
 configs/MPC8641HPCN_36BIT_defconfig                |   2 +
 configs/MPC8641HPCN_defconfig                      |   2 +
 configs/MSI_Primo81_defconfig                      |   1 +
 configs/Merrii_A80_Optimus_defconfig               |   1 +
 configs/MiniFAP_defconfig                          |   3 +
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig   |   1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig           |   1 +
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig    |   1 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig            |   1 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig         |   1 +
 .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |   1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig       |   1 +
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig         |   1 +
 configs/P1010RDB-PA_NAND_defconfig                 |   1 +
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig          |   1 +
 configs/P1010RDB-PA_NOR_defconfig                  |   1 +
 configs/P1010RDB-PA_SDCARD_defconfig               |   1 +
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig     |   1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig             |   1 +
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig   |   1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig           |   1 +
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig    |   1 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig            |   1 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig         |   1 +
 .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |   1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig       |   1 +
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig         |   1 +
 configs/P1010RDB-PB_NAND_defconfig                 |   1 +
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig          |   1 +
 configs/P1010RDB-PB_NOR_defconfig                  |   1 +
 configs/P1010RDB-PB_SDCARD_defconfig               |   1 +
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig     |   1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig             |   1 +
 configs/PATI_defconfig                             |   1 +
 configs/PIP405_defconfig                           |   7 +
 configs/PMC440_defconfig                           |   1 +
 configs/Sinovoip_BPI_M3_defconfig                  |   1 +
 configs/T1023RDB_NAND_defconfig                    |   1 +
 configs/T1023RDB_SDCARD_defconfig                  |   1 +
 configs/T1023RDB_SECURE_BOOT_defconfig             |   1 +
 configs/T1023RDB_SPIFLASH_defconfig                |   1 +
 configs/T1023RDB_defconfig                         |   1 +
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig        |   3 +
 configs/T1024QDS_DDR4_defconfig                    |   3 +
 configs/T1024QDS_NAND_defconfig                    |   3 +
 configs/T1024QDS_SDCARD_defconfig                  |   3 +
 configs/T1024QDS_SECURE_BOOT_defconfig             |   3 +
 configs/T1024QDS_SPIFLASH_defconfig                |   3 +
 configs/T1024QDS_defconfig                         |   3 +
 configs/T1024RDB_NAND_defconfig                    |   2 +
 configs/T1024RDB_SDCARD_defconfig                  |   2 +
 configs/T1024RDB_SECURE_BOOT_defconfig             |   2 +
 configs/T1024RDB_SPIFLASH_defconfig                |   2 +
 configs/T1024RDB_defconfig                         |   2 +
 configs/T1040D4RDB_NAND_defconfig                  |   2 +
 configs/T1040D4RDB_SDCARD_defconfig                |   2 +
 configs/T1040D4RDB_SECURE_BOOT_defconfig           |   2 +
 configs/T1040D4RDB_SPIFLASH_defconfig              |   2 +
 configs/T1040D4RDB_defconfig                       |   2 +
 configs/T1040QDS_DDR4_defconfig                    |   3 +
 configs/T1040QDS_SECURE_BOOT_defconfig             |   3 +
 configs/T1040QDS_defconfig                         |   3 +
 configs/T1040RDB_NAND_defconfig                    |   2 +
 configs/T1040RDB_SDCARD_defconfig                  |   2 +
 configs/T1040RDB_SECURE_BOOT_defconfig             |   2 +
 configs/T1040RDB_SPIFLASH_defconfig                |   2 +
 configs/T1040RDB_defconfig                         |   2 +
 configs/T1042D4RDB_NAND_defconfig                  |   4 +
 configs/T1042D4RDB_SDCARD_defconfig                |   4 +
 configs/T1042D4RDB_SECURE_BOOT_defconfig           |   4 +
 configs/T1042D4RDB_SPIFLASH_defconfig              |   4 +
 configs/T1042D4RDB_defconfig                       |   4 +
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig     |   4 +
 configs/T1042RDB_PI_NAND_defconfig                 |   4 +
 configs/T1042RDB_PI_SDCARD_defconfig               |   4 +
 configs/T1042RDB_PI_SPIFLASH_defconfig             |   4 +
 configs/T1042RDB_PI_defconfig                      |   4 +
 configs/T1042RDB_SECURE_BOOT_defconfig             |   2 +
 configs/T1042RDB_defconfig                         |   2 +
 configs/TQM5200_B_HIGHBOOT_defconfig               |   3 +
 configs/TQM5200_B_defconfig                        |   3 +
 configs/TQM5200_STK100_defconfig                   |   3 +
 configs/TQM5200_defconfig                          |   3 +
 configs/TQM823L_LCD_defconfig                      |   3 +-
 configs/TTTech_defconfig                           |   3 +-
 configs/VCMA9_defconfig                            |   1 +
 configs/a3m071_defconfig                           |   1 +
 configs/a4m072_defconfig                           |   1 +
 configs/a4m2k_defconfig                            |   1 +
 configs/apalis_t30_defconfig                       |   1 +
 configs/aristainetos2_defconfig                    |   3 +
 configs/aristainetos2b_defconfig                   |   3 +
 configs/aristainetos_defconfig                     |   3 +
 configs/arndale_defconfig                          |   2 +
 configs/at91rm9200ek_defconfig                     |   1 +
 configs/at91rm9200ek_ram_defconfig                 |   1 +
 configs/at91sam9261ek_dataflash_cs0_defconfig      |   2 +
 configs/at91sam9261ek_dataflash_cs3_defconfig      |   2 +
 configs/at91sam9261ek_nandflash_defconfig          |   2 +
 configs/at91sam9263ek_dataflash_cs0_defconfig      |   2 +
 configs/at91sam9263ek_dataflash_defconfig          |   2 +
 configs/at91sam9263ek_nandflash_defconfig          |   2 +
 configs/at91sam9263ek_norflash_boot_defconfig      |   2 +
 configs/at91sam9263ek_norflash_defconfig           |   2 +
 configs/at91sam9g10ek_dataflash_cs0_defconfig      |   2 +
 configs/at91sam9g10ek_dataflash_cs3_defconfig      |   2 +
 configs/at91sam9g10ek_nandflash_defconfig          |   2 +
 configs/at91sam9m10g45ek_mmc_defconfig             |   2 +
 configs/at91sam9m10g45ek_nandflash_defconfig       |   2 +
 configs/at91sam9n12ek_mmc_defconfig                |   2 +
 configs/at91sam9n12ek_nandflash_defconfig          |   2 +
 configs/at91sam9n12ek_spiflash_defconfig           |   2 +
 configs/at91sam9rlek_dataflash_defconfig           |   2 +
 configs/at91sam9rlek_mmc_defconfig                 |   2 +
 configs/at91sam9rlek_nandflash_defconfig           |   2 +
 configs/at91sam9x5ek_dataflash_defconfig           |   2 +
 configs/at91sam9x5ek_mmc_defconfig                 |   2 +
 configs/at91sam9x5ek_nandflash_defconfig           |   2 +
 configs/at91sam9x5ek_spiflash_defconfig            |   2 +
 configs/bayleybay_defconfig                        |   6 +
 configs/bct-brettl2_defconfig                      |   1 +
 configs/beaver_defconfig                           |   1 +
 configs/bf518f-ezbrd_defconfig                     |   1 +
 configs/bf526-ezbrd_defconfig                      |   1 +
 configs/bf527-ad7160-eval_defconfig                |   1 +
 configs/bf527-ezkit-v2_defconfig                   |   1 +
 configs/bf527-ezkit_defconfig                      |   1 +
 configs/bf527-sdp_defconfig                        |   1 +
 configs/bf533-ezkit_defconfig                      |   1 +
 configs/bf533-stamp_defconfig                      |   1 +
 configs/bf537-pnav_defconfig                       |   1 +
 configs/bf537-stamp_defconfig                      |   1 +
 configs/bf538f-ezkit_defconfig                     |   1 +
 configs/bf548-ezkit_defconfig                      |   1 +
 configs/bf561-acvilon_defconfig                    |   1 +
 configs/bf561-ezkit_defconfig                      |   1 +
 configs/br4_defconfig                              |   1 +
 configs/brppt1_mmc_defconfig                       |   4 +
 configs/brppt1_nand_defconfig                      |   4 +
 configs/brppt1_spi_defconfig                       |   4 +
 configs/brxre1_defconfig                           |   4 +
 configs/cardhu_defconfig                           |   1 +
 configs/cei-tk1-som_defconfig                      |   1 +
 configs/cgtqmx6eval_defconfig                      |   4 +
 configs/charon_defconfig                           |   3 +
 configs/chromebook_jerry_defconfig                 |   2 +
 configs/chromebook_link_defconfig                  |   6 +
 configs/chromebook_samus_defconfig                 |   3 +
 configs/chromebox_panther_defconfig                |   6 +
 configs/cm-bf527_defconfig                         |   1 +
 configs/cm-bf533_defconfig                         |   1 +
 configs/cm-bf537e_defconfig                        |   1 +
 configs/cm-bf537u_defconfig                        |   1 +
 configs/cm-bf548_defconfig                         |   2 +
 configs/cm-bf561_defconfig                         |   1 +
 configs/cm5200_defconfig                           |   1 +
 configs/cm_fx6_defconfig                           |   2 +
 configs/cm_t3517_defconfig                         |   2 +
 configs/cm_t35_defconfig                           |   2 +
 configs/colibri_imx7_defconfig                     |   2 +
 configs/colibri_t20_defconfig                      |   1 +
 configs/colibri_t30_defconfig                      |   1 +
 ...conga-qeval20-qa3-e3845-internal-uart_defconfig |   6 +
 configs/conga-qeval20-qa3-e3845_defconfig          |   6 +
 .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig  |   2 +
 configs/controlcenterd_36BIT_SDCARD_defconfig      |   2 +
 .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig   |   1 +
 configs/controlcenterd_TRAILBLAZER_defconfig       |   1 +
 configs/coreboot-x86_defconfig                     |   5 +
 configs/cougarcanyon2_defconfig                    |   3 +
 configs/crownbay_defconfig                         |   6 +
 configs/d2net_v2_defconfig                         |   1 +
 configs/dalmore_defconfig                          |   1 +
 configs/dfi-bt700-q7x-151_defconfig                |   6 +
 configs/digsy_mtc_RAMBOOT_defconfig                |   2 +
 configs/digsy_mtc_defconfig                        |   2 +
 configs/digsy_mtc_rev5_RAMBOOT_defconfig           |   2 +
 configs/digsy_mtc_rev5_defconfig                   |   2 +
 configs/dms-ba16-1g_defconfig                      |   4 +
 configs/dms-ba16_defconfig                         |   4 +
 configs/dns325_defconfig                           |   1 +
 configs/duovero_defconfig                          |   1 +
 configs/e2220-1170_defconfig                       |   1 +
 configs/ea20_defconfig                             |   4 +
 configs/eb_cpu5282_defconfig                       |   2 +
 configs/eb_cpu5282_internal_defconfig              |   2 +
 configs/efi-x86_defconfig                          |   3 +
 configs/espresso7420_defconfig                     |   2 +
 configs/evb-rk3288_defconfig                       |   2 +
 configs/fennec-rk3288_defconfig                    |   2 +
 configs/firefly-rk3288_defconfig                   |   2 +
 configs/fo300_defconfig                            |   3 +
 configs/galileo_defconfig                          |   3 +
 configs/ge_b450v3_defconfig                        |   2 +
 configs/ge_b650v3_defconfig                        |   2 +
 configs/ge_b850v3_defconfig                        |   2 +
 configs/goflexhome_defconfig                       |   1 +
 configs/gwventana_defconfig                        |   3 +
 configs/h2200_defconfig                            |   1 +
 configs/h8_homlet_v2_defconfig                     |   1 +
 configs/haleakala_defconfig                        |   1 +
 configs/harmony_defconfig                          |   1 +
 configs/ibf-dsp561_defconfig                       |   1 +
 configs/icon_defconfig                             |   3 +
 configs/igep0020_defconfig                         |   1 +
 configs/igep0030_defconfig                         |   1 +
 configs/igep0030_nand_defconfig                    |   1 +
 configs/igep0032_defconfig                         |   1 +
 configs/imx31_phycore_eet_defconfig                |   2 +
 configs/inetspace_v2_defconfig                     |   1 +
 configs/io64_defconfig                             |   1 +
 configs/ip04_defconfig                             |   1 +
 configs/ipek01_defconfig                           |   3 +
 configs/jetson-tk1_defconfig                       |   1 +
 configs/kc1_defconfig                              |   1 +
 configs/kilauea_defconfig                          |   1 +
 configs/ls1021aqds_ddr4_nor_defconfig              |   3 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig       |   3 +
 configs/ls1021aqds_nand_defconfig                  |   3 +
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig       |   3 +
 configs/ls1021aqds_nor_defconfig                   |   3 +
 configs/ls1021aqds_nor_lpuart_defconfig            |   3 +
 configs/ls1021aqds_qspi_defconfig                  |   3 +
 configs/ls1021aqds_sdcard_ifc_defconfig            |   3 +
 configs/ls1021aqds_sdcard_qspi_defconfig           |   3 +
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig       |   3 +
 configs/ls1021atwr_nor_defconfig                   |   3 +
 configs/ls1021atwr_nor_lpuart_defconfig            |   3 +
 configs/ls1021atwr_qspi_defconfig                  |   3 +
 .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig    |   3 +
 configs/ls1021atwr_sdcard_ifc_defconfig            |   3 +
 configs/ls1021atwr_sdcard_qspi_defconfig           |   3 +
 configs/lschlv2_defconfig                          |   1 +
 configs/lsxhl_defconfig                            |   1 +
 configs/lwmon5_defconfig                           |   4 +
 configs/m28evk_defconfig                           |   2 +
 configs/m53evk_defconfig                           |   2 +
 configs/makalu_defconfig                           |   1 +
 configs/marsboard_defconfig                        |   3 +
 configs/mcx_defconfig                              |   2 +
 configs/microblaze-generic_defconfig               |   1 +
 configs/miniarm-rk3288_defconfig                   |   2 +
 configs/minnowmax_defconfig                        |   6 +
 configs/mt_ventoux_defconfig                       |   2 +
 configs/mx23evk_defconfig                          |   2 +
 configs/mx28evk_auart_console_defconfig            |   2 +
 configs/mx28evk_defconfig                          |   2 +
 configs/mx28evk_nand_defconfig                     |   2 +
 configs/mx28evk_spi_defconfig                      |   2 +
 configs/mx51evk_defconfig                          |   3 +
 configs/mx53loco_defconfig                         |   3 +
 configs/mx6cuboxi_defconfig                        |   3 +
 configs/mx6dlsabreauto_defconfig                   |   3 +
 configs/mx6dlsabresd_defconfig                     |   3 +
 configs/mx6qpsabreauto_defconfig                   |   3 +
 configs/mx6qsabreauto_defconfig                    |   3 +
 configs/mx6qsabrelite_defconfig                    |   4 +
 configs/mx6qsabresd_defconfig                      |   3 +
 configs/mx6sabresd_spl_defconfig                   |   3 +
 configs/mx6sxsabresd_defconfig                     |   2 +
 configs/mx6sxsabresd_spl_defconfig                 |   2 +
 configs/mx6ul_14x14_evk_defconfig                  |   8 +-
 configs/mx6ul_9x9_evk_defconfig                    |   8 +-
 configs/mx7dsabresd_defconfig                      |   2 +
 configs/mx7dsabresd_secure_defconfig               |   2 +
 configs/nanopi_neo_defconfig                       |   1 +
 configs/net2big_v2_defconfig                       |   1 +
 configs/netspace_lite_v2_defconfig                 |   1 +
 configs/netspace_max_v2_defconfig                  |   1 +
 configs/netspace_mini_v2_defconfig                 |   1 +
 configs/netspace_v2_defconfig                      |   1 +
 configs/nitrogen6dl2g_defconfig                    |   4 +
 configs/nitrogen6dl_defconfig                      |   4 +
 configs/nitrogen6q2g_defconfig                     |   4 +
 configs/nitrogen6q_defconfig                       |   4 +
 configs/nitrogen6s1g_defconfig                     |   4 +
 configs/nitrogen6s_defconfig                       |   4 +
 configs/nokia_rx51_defconfig                       |   3 +
 configs/novena_defconfig                           |   3 +
 configs/odroid-xu3_defconfig                       |   2 +
 configs/odroid_defconfig                           |   1 +
 configs/omap3_pandora_defconfig                    |   1 +
 configs/omap3_zoom1_defconfig                      |   1 +
 configs/omap4_panda_defconfig                      |   1 +
 configs/omap4_sdp4430_defconfig                    |   1 +
 configs/orangepi_2_defconfig                       |   1 +
 configs/orangepi_lite_defconfig                    |   1 +
 configs/orangepi_one_defconfig                     |   1 +
 configs/orangepi_pc_defconfig                      |   1 +
 configs/orangepi_pc_plus_defconfig                 |   1 +
 configs/orangepi_plus2e_defconfig                  |   1 +
 configs/orangepi_plus_defconfig                    |   1 +
 configs/origen_defconfig                           |   1 +
 configs/p2371-0000_defconfig                       |   1 +
 configs/p2371-2180_defconfig                       |   1 +
 configs/p2571_defconfig                            |   1 +
 configs/p2771-0000-000_defconfig                   |   1 +
 configs/p2771-0000-500_defconfig                   |   1 +
 configs/paz00_defconfig                            |   1 +
 configs/pdm360ng_defconfig                         |   2 +
 configs/peach-pi_defconfig                         |   2 +
 configs/peach-pit_defconfig                        |   2 +
 configs/picosam9g45_defconfig                      |   2 +
 configs/pine64_plus_defconfig                      |   1 +
 configs/plutux_defconfig                           |   1 +
 configs/pm9261_defconfig                           |   2 +
 configs/pm9263_defconfig                           |   2 +
 configs/popmetal-rk3288_defconfig                  |   2 +
 configs/pr1_defconfig                              |   1 +
 configs/pxm2_defconfig                             |   4 +
 configs/qemu-x86_defconfig                         |   6 +
 configs/qemu-x86_efi_payload32_defconfig           |   6 +
 configs/qemu-x86_efi_payload64_defconfig           |   6 +
 configs/rainier_defconfig                          |   1 +
 configs/rainier_ramboot_defconfig                  |   1 +
 configs/riotboard_defconfig                        |   3 +
 configs/rock2_defconfig                            |   2 +
 configs/rpi_2_defconfig                            |   3 +
 configs/rpi_3_32b_defconfig                        |   3 +
 configs/rpi_3_defconfig                            |   3 +
 configs/rpi_defconfig                              |   3 +
 configs/rut_defconfig                              |   4 +
 configs/s5p_goni_defconfig                         |   1 +
 configs/s5pc210_universal_defconfig                |   1 +
 configs/sama5d3xek_mmc_defconfig                   |   2 +
 configs/sama5d3xek_nandflash_defconfig             |   2 +
 configs/sama5d3xek_spiflash_defconfig              |   2 +
 configs/sama5d4ek_mmc_defconfig                    |   2 +
 configs/sama5d4ek_nandflash_defconfig              |   2 +
 configs/sama5d4ek_spiflash_defconfig               |   2 +
 configs/sandbox_defconfig                          |   1 +
 configs/sandbox_noblk_defconfig                    |   1 +
 configs/sandbox_spl_defconfig                      |   1 +
 configs/sansa_fuze_plus_defconfig                  |   2 +
 configs/seaboard_defconfig                         |   2 +
 configs/sequoia_defconfig                          |   1 +
 configs/sequoia_ramboot_defconfig                  |   1 +
 configs/smdk2410_defconfig                         |   1 +
 configs/smdk5250_defconfig                         |   2 +
 configs/smdk5420_defconfig                         |   2 +
 configs/sniper_defconfig                           |   1 +
 configs/snow_defconfig                             |   2 +
 configs/socfpga_arria5_defconfig                   |   3 +
 configs/socfpga_cyclone5_defconfig                 |   3 +
 configs/socfpga_de0_nano_soc_defconfig             |   3 +
 configs/socfpga_is1_defconfig                      |   3 +
 configs/socfpga_mcvevk_defconfig                   |   3 +
 configs/socfpga_sockit_defconfig                   |   3 +
 configs/socfpga_socrates_defconfig                 |   3 +
 configs/socfpga_sr1500_defconfig                   |   3 +
 configs/socfpga_vining_fpga_defconfig              |   3 +
 configs/socrates_defconfig                         |   3 +
 configs/som-db5800-som-6867_defconfig              |   6 +
 configs/spring_defconfig                           |   2 +
 configs/tbs2910_defconfig                          |   6 +
 configs/tcm-bf518_defconfig                        |   1 +
 configs/tcm-bf537_defconfig                        |   1 +
 configs/tec-ng_defconfig                           |   1 +
 configs/theadorable-x86-dfi-bt700_defconfig        |   6 +
 configs/theadorable_debug_defconfig                |   3 +
 configs/theadorable_defconfig                      |   3 +
 configs/trats2_defconfig                           |   1 +
 configs/trats_defconfig                            |   1 +
 configs/tricorder_defconfig                        |   1 +
 configs/tricorder_flash_defconfig                  |   1 +
 configs/trimslice_defconfig                        |   1 +
 configs/venice2_defconfig                          |   1 +
 configs/ventana_defconfig                          |   2 +
 configs/wandboard_defconfig                        |   3 +
 configs/whistler_defconfig                         |   1 +
 configs/wtk_defconfig                              |   3 +-
 configs/xfi3_defconfig                             |   2 +
 configs/zipitz2_defconfig                          |   1 +
 drivers/net/ax88180.c                              |   6 +-
 drivers/serial/serial-uclass.c                     |   2 +-
 drivers/usb/host/isp116x-hcd.c                     |   6 +-
 drivers/video/Kconfig                              | 146 ++++
 drivers/video/Makefile                             |   4 -
 drivers/video/cfb_console.c                        | 236 ++----
 drivers/video/ct69000.c                            |  78 --
 drivers/video/imx25lcdc.c                          | 121 ---
 drivers/video/s3c-fb.c                             | 172 -----
 drivers/video/sed13806.c                           | 286 -------
 drivers/video/smiLynxEM.c                          | 835 ---------------------
 include/asm-generic/global_data.h                  |   2 +-
 include/configs/10m50_devboard.h                   |   1 -
 include/configs/3c120_devboard.h                   |   1 -
 include/configs/B4860QDS.h                         |   3 -
 include/configs/BSC9131RDB.h                       |   2 -
 include/configs/BSC9132QDS.h                       |   2 -
 include/configs/C29XPCIE.h                         |   2 -
 include/configs/CPCI2DP.h                          |   2 -
 include/configs/CPCI4052.h                         |   2 +-
 include/configs/M52277EVB.h                        |   1 -
 include/configs/M5249EVB.h                         |   1 -
 include/configs/MIP405.h                           |  12 -
 include/configs/MPC8349ITX.h                       |   6 +-
 include/configs/MPC8536DS.h                        |   4 -
 include/configs/MPC8544DS.h                        |   4 -
 include/configs/MPC8572DS.h                        |   4 -
 include/configs/MPC8610HPCD.h                      |   6 -
 include/configs/MPC8641HPCN.h                      |   6 -
 include/configs/MigoR.h                            |   4 -
 include/configs/P1010RDB.h                         |   2 -
 include/configs/P1022DS.h                          |   8 -
 include/configs/PATI.h                             |   1 -
 include/configs/PIP405.h                           |  12 -
 include/configs/PLU405.h                           |   2 -
 include/configs/PMC405DE.h                         |   1 -
 include/configs/PMC440.h                           |   2 -
 include/configs/T102xQDS.h                         |   6 -
 include/configs/T102xRDB.h                         |   6 -
 include/configs/T1040QDS.h                         |   6 -
 include/configs/T104xRDB.h                         |   9 -
 include/configs/TQM5200.h                          |   7 -
 include/configs/UCP1020.h                          |   4 -
 include/configs/VCMA9.h                            |   2 -
 include/configs/VOM405.h                           |   2 -
 include/configs/a3m071.h                           |   3 -
 include/configs/a4m072.h                           |   1 -
 include/configs/ac14xx.h                           |   5 -
 include/configs/advantech_dms-ba16.h               |  10 +-
 include/configs/am3517_crane.h                     |   1 -
 include/configs/amcc-common.h                      |   1 -
 include/configs/amcore.h                           |   1 -
 include/configs/ap325rxa.h                         |   3 -
 include/configs/ap_sh4a_4a.h                       |   3 -
 include/configs/aria.h                             |   6 -
 include/configs/aristainetos-common.h              |   7 +-
 include/configs/aristainetos.h                     |   2 +-
 include/configs/aristainetos2.h                    |   2 +-
 include/configs/aristainetos2b.h                   |   2 +-
 include/configs/armadillo-800eva.h                 |   3 -
 include/configs/at91rm9200ek.h                     |   1 -
 include/configs/at91sam9261ek.h                    |   3 -
 include/configs/at91sam9263ek.h                    |   2 -
 include/configs/at91sam9m10g45ek.h                 |   2 -
 include/configs/at91sam9n12ek.h                    |   2 -
 include/configs/at91sam9rlek.h                     |   2 -
 include/configs/at91sam9x5ek.h                     |   2 -
 include/configs/bf527-ezkit.h                      |   3 -
 include/configs/bf533-stamp.h                      |   1 -
 include/configs/bf548-ezkit.h                      |   1 -
 include/configs/bfin_adi_common.h                  |   1 -
 include/configs/brppt1.h                           |   1 -
 include/configs/brxre1.h                           |   1 -
 include/configs/bur_cfg_common.h                   |   3 -
 include/configs/cgtqmx6eval.h                      |  10 +-
 include/configs/chromebook_jerry.h                 |   1 -
 include/configs/chromebook_samus.h                 |   2 -
 include/configs/clearfog.h                         |   1 -
 include/configs/cm-bf548.h                         |   1 -
 include/configs/cm5200.h                           |   1 -
 include/configs/cm_fx6.h                           |   7 -
 include/configs/cm_t35.h                           |   2 -
 include/configs/cm_t3517.h                         |   2 -
 include/configs/colibri_imx7.h                     |   5 -
 include/configs/colibri_pxa270.h                   |   1 -
 include/configs/colibri_t20.h                      |   1 -
 include/configs/controlcenterd.h                   |   5 -
 include/configs/cougarcanyon2.h                    |   2 -
 include/configs/cyrus.h                            |   4 -
 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/digsy_mtc.h                        |   5 -
 include/configs/dns325.h                           |   2 -
 include/configs/ea20.h                             |   6 -
 include/configs/eb_cpu5282.h                       |   2 -
 include/configs/ecovec.h                           |   3 -
 include/configs/edminiv2.h                         |   1 -
 include/configs/efi-x86.h                          |   2 -
 include/configs/el6x_common.h                      |   2 +-
 include/configs/embestmx6boards.h                  |   7 +-
 include/configs/evb_rk3288.h                       |   1 -
 include/configs/evb_rk3399.h                       |   1 -
 include/configs/exynos5-common.h                   |   3 -
 include/configs/exynos5-dt-common.h                |   1 -
 include/configs/exynos7420-common.h                |   3 -
 include/configs/fennec_rk3288.h                    |   1 -
 include/configs/firefly-rk3288.h                   |   1 -
 include/configs/galileo.h                          |   2 -
 include/configs/ge_bx50v3.h                        |  10 +-
 include/configs/goflexhome.h                       |   2 -
 include/configs/gr_ep2s60.h                        |   1 -
 include/configs/gw_ventana.h                       |   6 -
 include/configs/h2200.h                            |   1 -
 include/configs/harmony.h                          |   1 -
 include/configs/hrcon.h                            |   2 -
 include/configs/icon.h                             |   5 -
 include/configs/imx31_phycore.h                    |   5 -
 include/configs/io64.h                             |   2 -
 include/configs/ipek01.h                           |   6 -
 include/configs/kc1.h                              |   2 -
 include/configs/kilauea.h                          |   2 -
 include/configs/km/km_arm.h                        |   1 -
 include/configs/kzm9g.h                            |   3 -
 include/configs/lacie_kw.h                         |   2 -
 include/configs/ls1021aqds.h                       |   7 -
 include/configs/ls1021atwr.h                       |   7 -
 include/configs/lsxl.h                             |   2 -
 include/configs/lwmon5.h                           |   8 -
 include/configs/m28evk.h                           |   1 -
 include/configs/m53evk.h                           |   4 -
 include/configs/ma5d4evk.h                         |   2 -
 include/configs/makalu.h                           |   2 -
 include/configs/maxbcm.h                           |   1 -
 include/configs/mcx.h                              |   4 -
 include/configs/microblaze-generic.h               |   2 -
 include/configs/miniarm_rk3288.h                   |   1 -
 include/configs/mpc5121ads.h                       |   4 -
 include/configs/ms7722se.h                         |   3 -
 include/configs/mt_ventoux.h                       |   4 -
 include/configs/mv-common.h                        |   1 -
 include/configs/mvebu_db-88f3720.h                 |   2 -
 include/configs/mvebu_db-88f7040.h                 |   2 -
 include/configs/mx23evk.h                          |   2 -
 include/configs/mx28evk.h                          |   1 -
 include/configs/mx51evk.h                          |   5 -
 include/configs/mx53loco.h                         |   5 -
 include/configs/mx6cuboxi.h                        |  10 +-
 include/configs/mx6qsabreauto.h                    |   2 +-
 include/configs/mx6sabre_common.h                  |   7 +-
 include/configs/mx6sabresd.h                       |   2 +-
 include/configs/mx6sxsabresd.h                     |   5 -
 include/configs/mx6ul_14x14_evk.h                  |   5 -
 include/configs/mx7dsabresd.h                      |   5 -
 include/configs/mxs.h                              |   4 -
 include/configs/nitrogen6x.h                       |   7 -
 include/configs/nokia_rx51.h                       |   5 -
 include/configs/novena.h                           |   7 -
 include/configs/o2dnt-common.h                     |   6 +-
 include/configs/odroid.h                           |   2 -
 include/configs/omap3_evm.h                        |   1 -
 include/configs/omap3_igep00x0.h                   |   1 -
 include/configs/omap3_pandora.h                    |   1 -
 include/configs/omap3_zoom1.h                      |   1 -
 include/configs/openrisc-generic.h                 |   1 -
 include/configs/origen.h                           |   2 -
 include/configs/paz00.h                            |   1 -
 include/configs/pcm058.h                           |   2 +-
 include/configs/pdm360ng.h                         |   4 -
 include/configs/peach-pi.h                         |   1 -
 include/configs/picosam9g45.h                      |   2 -
 include/configs/pm9261.h                           |   2 -
 include/configs/pm9263.h                           |   2 -
 include/configs/popmetal_rk3288.h                  |   1 -
 include/configs/pxm2.h                             |   5 -
 include/configs/r0p7734.h                          |   3 -
 include/configs/rcar-gen2-common.h                 |   3 -
 include/configs/rcar-gen3-common.h                 |   3 -
 include/configs/rk3288_common.h                    |   6 -
 include/configs/rock2.h                            |   1 -
 include/configs/rpi.h                              |   6 -
 include/configs/rut.h                              |   5 -
 include/configs/s5p_goni.h                         |   1 -
 include/configs/s5pc210_universal.h                |   2 -
 include/configs/sama5d2_xplained.h                 |   2 -
 include/configs/sama5d3xek.h                       |   2 -
 include/configs/sama5d4_xplained.h                 |   2 -
 include/configs/sama5d4ek.h                        |   2 -
 include/configs/sandbox.h                          |   5 -
 include/configs/sansa_fuze_plus.h                  |   2 -
 include/configs/seaboard.h                         |   2 -
 include/configs/sequoia.h                          |   6 -
 include/configs/sh7752evb.h                        |   3 -
 include/configs/sh7753evb.h                        |   3 -
 include/configs/sh7757lcr.h                        |   3 -
 include/configs/sh7785lcr.h                        |   3 -
 include/configs/siemens-am33x-common.h             |   1 -
 include/configs/smdk2410.h                         |   1 -
 include/configs/smdk5250.h                         |   1 -
 include/configs/smdk5420.h                         |   1 -
 include/configs/snapper9g45.h                      |   2 -
 include/configs/sniper.h                           |   2 -
 include/configs/socfpga_common.h                   |   3 -
 include/configs/socfpga_sr1500.h                   |   1 -
 include/configs/socrates.h                         |   6 -
 include/configs/spear-common.h                     |   1 -
 include/configs/strider.h                          |   2 -
 include/configs/sunxi-common.h                     |  13 -
 include/configs/tbs2910.h                          |  13 -
 include/configs/tegra-common.h                     |   6 -
 include/configs/theadorable.h                      |   4 -
 include/configs/ti814x_evm.h                       |   1 -
 include/configs/ti816x_evm.h                       |   1 -
 include/configs/ti_armv7_common.h                  |   1 -
 include/configs/ti_omap4_common.h                  |   1 -
 include/configs/tqma6.h                            |   2 +-
 include/configs/tqma6_mba6.h                       |   2 +-
 include/configs/tqma6_wru4.h                       |   2 +-
 include/configs/trats.h                            |   2 -
 include/configs/trats2.h                           |   2 -
 include/configs/tricorder.h                        |   2 -
 include/configs/vct.h                              |   1 -
 include/configs/ventana.h                          |   2 -
 include/configs/wandboard.h                        |   5 -
 include/configs/x600.h                             |   1 -
 include/configs/x86-common.h                       |  12 -
 include/configs/xfi3.h                             |   2 -
 include/configs/xilinx-ppc.h                       |   1 -
 include/configs/xpress.h                           |   1 -
 include/configs/zc5202.h                           |   2 +-
 include/configs/zc5601.h                           |   2 +-
 include/configs/zipitz2.h                          |   1 -
 include/lcd_console.h                              |   3 -
 include/sed13806.h                                 |  81 --
 include/stdio_dev.h                                |   2 +-
 include/video.h                                    |  11 +
 include/video_fb.h                                 |  12 -
 scripts/config_whitelist.txt                       |  28 -
 669 files changed, 1280 insertions(+), 2596 deletions(-)
 delete mode 100644 drivers/video/imx25lcdc.c
 delete mode 100644 drivers/video/s3c-fb.c
 delete mode 100644 drivers/video/sed13806.c
 delete mode 100644 drivers/video/smiLynxEM.c
 delete mode 100644 include/sed13806.h
Signature · 1 line
2.8.0.rc3.226.g39d4020
#1 lore raw

PATCH v3 1/29 Remove some merge markers

These two files have patch merge markers in them, within comments or strings. Remove then, so that a search for merge markers does not show up matches in these files.

---

Changes in v3: None
Changes in v2: None

 drivers/net/ax88180.c          | 6 +-----
 drivers/usb/host/isp116x-hcd.c | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/net/ax88180.c +1 -5
index 43a67a5..261fde0 100644
@@ -698,11 +698,7 @@ static void ax88180_read_mac_addr (struct eth_device *dev)
 	}
 }
 
-/*
-===========================================================================
-<<<<<<			Exported SubProgram Bodies		>>>>>>
-===========================================================================
-*/
+/* Exported SubProgram Bodies */
 int ax88180_initialize (bd_t * bis)
 {
 	struct eth_device *dev;
drivers/usb/host/isp116x-hcd.c +3 -3
index 0556f32..32874d7 100644
@@ -428,10 +428,10 @@ static int isp116x_interrupt(struct isp116x *isp116x)
 	isp116x_write_reg16(isp116x, HCuPINTENB, 0);
 	irqstat = isp116x_read_reg16(isp116x, HCuPINT);
 	isp116x_write_reg16(isp116x, HCuPINT, irqstat);
-	DBG(">>>>>> irqstat %x <<<<<<", irqstat);
+	DBG("------ irqstat %x ------", irqstat);
 
 	if (irqstat & HCuPINT_ATL) {
-		DBG(">>>>>> HCuPINT_ATL <<<<<<");
+		DBG("------ HCuPINT_ATL ------");
 		udelay(500);
 		ret = 1;
 	}
@@ -439,7 +439,7 @@ static int isp116x_interrupt(struct isp116x *isp116x)
 	if (irqstat & HCuPINT_OPR) {
 		intstat = isp116x_read_reg32(isp116x, HCINTSTAT);
 		isp116x_write_reg32(isp116x, HCINTSTAT, intstat);
-		DBG(">>>>>> HCuPINT_OPR %x <<<<<<", intstat);
+		DBG("------ HCuPINT_OPR %x ------", intstat);
 
 		if (intstat & HCINT_UE) {
 			ERR("unrecoverable error, controller disabled");
Signature · 1 line
2.8.0.rc3.226.g39d4020
#2 lore raw

PATCH v3 1/29 Remove some merge markers

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 6 lines

These two files have patch merge markers in them, within comments or strings. Remove then, so that a search for merge markers does not show up matches in these files.

Quoted 8 lines

---

Changes in v3: None
Changes in v2: None

  drivers/net/ax88180.c          | 6 +-----
  drivers/usb/host/isp116x-hcd.c | 6 +++---
  2 files changed, 4 insertions(+), 8 deletions(-)

bye,
Heiko

Quoted 45 lines
drivers/net/ax88180.c +1 -5
index 43a67a5..261fde0 100644
@@ -698,11 +698,7 @@ static void ax88180_read_mac_addr (struct eth_device *dev)
  	}
  }
 
-/*
-===========================================================================
-<<<<<<			Exported SubProgram Bodies		>>>>>>
-===========================================================================
-*/
+/* Exported SubProgram Bodies */
  int ax88180_initialize (bd_t * bis)
  {
  	struct eth_device *dev;
drivers/usb/host/isp116x-hcd.c +3 -3
index 0556f32..32874d7 100644
@@ -428,10 +428,10 @@ static int isp116x_interrupt(struct isp116x *isp116x)
  	isp116x_write_reg16(isp116x, HCuPINTENB, 0);
  	irqstat = isp116x_read_reg16(isp116x, HCuPINT);
  	isp116x_write_reg16(isp116x, HCuPINT, irqstat);
-	DBG(">>>>>> irqstat %x <<<<<<", irqstat);
+	DBG("------ irqstat %x ------", irqstat);
 
  	if (irqstat & HCuPINT_ATL) {
-		DBG(">>>>>> HCuPINT_ATL <<<<<<");
+		DBG("------ HCuPINT_ATL ------");
  		udelay(500);
  		ret = 1;
  	}
@@ -439,7 +439,7 @@ static int isp116x_interrupt(struct isp116x *isp116x)
  	if (irqstat & HCuPINT_OPR) {
  		intstat = isp116x_read_reg32(isp116x, HCINTSTAT);
  		isp116x_write_reg32(isp116x, HCINTSTAT, intstat);
-		DBG(">>>>>> HCuPINT_OPR %x <<<<<<", intstat);
+		DBG("------ HCuPINT_OPR %x ------", intstat);
 
  		if (intstat & HCINT_UE) {
  			ERR("unrecoverable error, controller disabled");
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#3 lore raw

PATCH v3 2/29 Convert SILENT_CONSOLE options to Kconfig

In reply to Simon Glass

Move these option to Kconfig and tidy up existing uses.

The Power PC boards don't have a suitable common element: the common header files don't appear to line up with the Kconfig files as far as I can tell. This results in a lot of defconfig changes.

---

Changes in v3: None
Changes in v2:
- Drop the changes to Kconfig defaults

 README                                             |  5 ---
 common/Kconfig                                     | 45 ++++++++++++++++++++++
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig        |  1 +
 configs/T1024QDS_DDR4_defconfig                    |  1 +
 configs/T1024QDS_NAND_defconfig                    |  1 +
 configs/T1024QDS_SDCARD_defconfig                  |  1 +
 configs/T1024QDS_SECURE_BOOT_defconfig             |  1 +
 configs/T1024QDS_SPIFLASH_defconfig                |  1 +
 configs/T1024QDS_defconfig                         |  1 +
 configs/T1024RDB_NAND_defconfig                    |  1 +
 configs/T1024RDB_SDCARD_defconfig                  |  1 +
 configs/T1024RDB_SECURE_BOOT_defconfig             |  1 +
 configs/T1024RDB_SPIFLASH_defconfig                |  1 +
 configs/T1024RDB_defconfig                         |  1 +
 configs/T1040D4RDB_NAND_defconfig                  |  1 +
 configs/T1040D4RDB_SDCARD_defconfig                |  1 +
 configs/T1040D4RDB_SECURE_BOOT_defconfig           |  1 +
 configs/T1040D4RDB_SPIFLASH_defconfig              |  1 +
 configs/T1040D4RDB_defconfig                       |  1 +
 configs/T1040QDS_DDR4_defconfig                    |  1 +
 configs/T1040QDS_SECURE_BOOT_defconfig             |  1 +
 configs/T1040QDS_defconfig                         |  1 +
 configs/T1040RDB_NAND_defconfig                    |  1 +
 configs/T1040RDB_SDCARD_defconfig                  |  1 +
 configs/T1040RDB_SECURE_BOOT_defconfig             |  1 +
 configs/T1040RDB_SPIFLASH_defconfig                |  1 +
 configs/T1040RDB_defconfig                         |  1 +
 configs/T1042D4RDB_NAND_defconfig                  |  1 +
 configs/T1042D4RDB_SDCARD_defconfig                |  1 +
 configs/T1042D4RDB_SECURE_BOOT_defconfig           |  1 +
 configs/T1042D4RDB_SPIFLASH_defconfig              |  1 +
 configs/T1042D4RDB_defconfig                       |  1 +
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig     |  1 +
 configs/T1042RDB_PI_NAND_defconfig                 |  1 +
 configs/T1042RDB_PI_SDCARD_defconfig               |  1 +
 configs/T1042RDB_PI_SPIFLASH_defconfig             |  1 +
 configs/T1042RDB_PI_defconfig                      |  1 +
 configs/T1042RDB_SECURE_BOOT_defconfig             |  1 +
 configs/T1042RDB_defconfig                         |  1 +
 configs/a4m072_defconfig                           |  1 +
 configs/arndale_defconfig                          |  1 +
 configs/bct-brettl2_defconfig                      |  1 +
 configs/bf518f-ezbrd_defconfig                     |  1 +
 configs/bf526-ezbrd_defconfig                      |  1 +
 configs/bf527-ad7160-eval_defconfig                |  1 +
 configs/bf527-ezkit-v2_defconfig                   |  1 +
 configs/bf527-ezkit_defconfig                      |  1 +
 configs/bf527-sdp_defconfig                        |  1 +
 configs/bf533-ezkit_defconfig                      |  1 +
 configs/bf533-stamp_defconfig                      |  1 +
 configs/bf537-pnav_defconfig                       |  1 +
 configs/bf537-stamp_defconfig                      |  1 +
 configs/bf538f-ezkit_defconfig                     |  1 +
 configs/bf548-ezkit_defconfig                      |  1 +
 configs/bf561-acvilon_defconfig                    |  1 +
 configs/bf561-ezkit_defconfig                      |  1 +
 configs/br4_defconfig                              |  1 +
 configs/chromebook_jerry_defconfig                 |  1 +
 configs/cm-bf527_defconfig                         |  1 +
 configs/cm-bf533_defconfig                         |  1 +
 configs/cm-bf537e_defconfig                        |  1 +
 configs/cm-bf537u_defconfig                        |  1 +
 configs/cm-bf548_defconfig                         |  1 +
 configs/cm-bf561_defconfig                         |  1 +
 configs/cm5200_defconfig                           |  1 +
 configs/espresso7420_defconfig                     |  1 +
 configs/evb-rk3288_defconfig                       |  1 +
 configs/fennec-rk3288_defconfig                    |  1 +
 configs/firefly-rk3288_defconfig                   |  1 +
 configs/fo300_defconfig                            |  1 +
 configs/ibf-dsp561_defconfig                       |  1 +
 configs/ip04_defconfig                             |  1 +
 configs/ls1021aqds_ddr4_nor_defconfig              |  1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig       |  1 +
 configs/ls1021aqds_nand_defconfig                  |  1 +
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig       |  1 +
 configs/ls1021aqds_nor_defconfig                   |  1 +
 configs/ls1021aqds_nor_lpuart_defconfig            |  1 +
 configs/ls1021aqds_qspi_defconfig                  |  1 +
 configs/ls1021aqds_sdcard_ifc_defconfig            |  1 +
 configs/ls1021aqds_sdcard_qspi_defconfig           |  1 +
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig       |  1 +
 configs/ls1021atwr_nor_defconfig                   |  1 +
 configs/ls1021atwr_nor_lpuart_defconfig            |  1 +
 configs/ls1021atwr_qspi_defconfig                  |  1 +
 .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig    |  1 +
 configs/ls1021atwr_sdcard_ifc_defconfig            |  1 +
 configs/ls1021atwr_sdcard_qspi_defconfig           |  1 +
 configs/miniarm-rk3288_defconfig                   |  1 +
 configs/odroid-xu3_defconfig                       |  1 +
 configs/pdm360ng_defconfig                         |  1 +
 configs/peach-pi_defconfig                         |  1 +
 configs/peach-pit_defconfig                        |  1 +
 configs/popmetal-rk3288_defconfig                  |  1 +
 configs/pr1_defconfig                              |  1 +
 configs/rock2_defconfig                            |  1 +
 configs/sandbox_defconfig                          |  1 +
 configs/sandbox_noblk_defconfig                    |  1 +
 configs/sandbox_spl_defconfig                      |  1 +
 configs/smdk5250_defconfig                         |  1 +
 configs/smdk5420_defconfig                         |  1 +
 configs/snow_defconfig                             |  1 +
 configs/spring_defconfig                           |  1 +
 configs/tcm-bf518_defconfig                        |  1 +
 configs/tcm-bf537_defconfig                        |  1 +
 configs/tricorder_defconfig                        |  1 +
 configs/tricorder_flash_defconfig                  |  1 +
 include/configs/T102xQDS.h                         |  1 -
 include/configs/T102xRDB.h                         |  1 -
 include/configs/T1040QDS.h                         |  1 -
 include/configs/T104xRDB.h                         |  1 -
 include/configs/TQM5200.h                          |  1 -
 include/configs/UCP1020.h                          |  4 --
 include/configs/a4m072.h                           |  1 -
 include/configs/bfin_adi_common.h                  |  1 -
 include/configs/cm5200.h                           |  1 -
 include/configs/exynos5-common.h                   |  1 -
 include/configs/exynos7420-common.h                |  1 -
 include/configs/ls1021aqds.h                       |  3 --
 include/configs/ls1021atwr.h                       |  3 --
 include/configs/pdm360ng.h                         |  1 -
 include/configs/rk3288_common.h                    |  1 -
 include/configs/sandbox.h                          |  1 -
 include/configs/tricorder.h                        |  2 -
 scripts/config_whitelist.txt                       |  3 --
 125 files changed, 150 insertions(+), 33 deletions(-)
README +0 -5
index bc626dc..0a1f3fe 100644
@@ -853,11 +853,6 @@ The following options need to be configured:
 		default i/o. Serial console can be forced with
 		environment 'console=serial'.
 
-		When CONFIG_SILENT_CONSOLE is defined, all console
-		messages (by U-Boot and Linux!) can be silenced with
-		the "silent" environment variable. See
-		doc/README.silent for more information.
-
 		CONFIG_SYS_CONSOLE_BG_COL: define the backgroundcolor, default
 			is 0x00.
 		CONFIG_SYS_CONSOLE_FG_COL: define the foregroundcolor, default
common/Kconfig +45 -0

57 lines not on this page · raw message

configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +1 -0
index 828bb9b..395330d 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1024QDS_DDR4_defconfig +1 -0
index 7767e0d..fd1f2f0 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1024QDS_NAND_defconfig +1 -0
index 7173342..a62560a 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024QDS_SDCARD_defconfig +1 -0
index a1c93ae..5a2f3f9 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024QDS_SECURE_BOOT_defconfig +1 -0
index 371d5f6..04787a0 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1024QDS_SPIFLASH_defconfig +1 -0
index f134850..1a96a63 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024QDS_defconfig +1 -0
index b0e9827..6f6fc86 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1024RDB_NAND_defconfig +1 -0
index 91beb24..737c648 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024RDB_SDCARD_defconfig +1 -0
index 11aceb8..444d7f8 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024RDB_SECURE_BOOT_defconfig +1 -0
index 70961ec..2eada3f 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
index 09fe6c4..2c0f761 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024RDB_defconfig +1 -0
index e013fdc..aa24d57 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/T1040D4RDB_NAND_defconfig +1 -0
index e9c7708..b1d1159 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040D4RDB_SDCARD_defconfig +1 -0
index 098ef3b..5a3a00f 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040D4RDB_SECURE_BOOT_defconfig +1 -0
index d727450..e437f3e 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040D4RDB_SPIFLASH_defconfig +1 -0
index 002346a..55671a6 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040D4RDB_defconfig +1 -0
index fc28d1f..f68d6f2 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040QDS_DDR4_defconfig +1 -0
index 4f470aa..bda4fb3 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040QDS_SECURE_BOOT_defconfig +1 -0
index ae6aacf..4ec922a 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040QDS_defconfig +1 -0
index dd53bb4..6de7d31 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040RDB_NAND_defconfig +1 -0
index 9e5a409..e144a88 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040RDB_SDCARD_defconfig +1 -0
index a43304b..aa3f0f8 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040RDB_SECURE_BOOT_defconfig +1 -0
index e0887de..00e5b12 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT,T1040RDB"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040RDB_SPIFLASH_defconfig +1 -0
index 1782e07..466bdd7 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040RDB_defconfig +1 -0
index 28b7bb4..422a738 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042D4RDB_NAND_defconfig +1 -0
index d2772fe..d631eca 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042D4RDB_SDCARD_defconfig +1 -0
index f8c5d45..aeea55f 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042D4RDB_SECURE_BOOT_defconfig +1 -0
index fa3c412..d6ceeba 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index fca6122..66a2c44 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042D4RDB_defconfig +1 -0
index f611baf..71dabd9 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +1 -0
index aa02cec..6d01cf2 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND,SECURE_BOOT"
 CONFIG_BOOTDELAY=0
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_CRYPTO_SUPPORT=y
 CONFIG_SPL_HASH_SUPPORT=y
configs/T1042RDB_PI_NAND_defconfig +1 -0
index 96985ac..0377d25 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042RDB_PI_SDCARD_defconfig +1 -0
index fd5da57..1894c62 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042RDB_PI_SPIFLASH_defconfig +1 -0
index bf41ff5..1cb34a5 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042RDB_PI_defconfig +1 -0
index 7d70b57..ef8332b 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042RDB_SECURE_BOOT_defconfig +1 -0
index 1539c85..224d1d8 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,SECURE_BOOT,T1042RDB"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042RDB_defconfig +1 -0
index 817c0dc..ee35e43 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
 CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/a4m072_defconfig +1 -0
index 18dddd9..bf4ac25 100644
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_A4M072=y
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n"
configs/arndale_defconfig +1 -0
index e04ff5b..f78a88c 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for ARNDALE"
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ARNDALE # "
configs/bct-brettl2_defconfig +1 -0
index ad894a2..5dae665 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BCT_BRETTL2=y
 CONFIG_BOOTDELAY=1
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
configs/bf518f-ezbrd_defconfig +1 -0
index e17c969..7f30237 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF518F_EZBRD=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
configs/bf526-ezbrd_defconfig +1 -0
index d3cab9b..663a6a3 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF526_EZBRD=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
configs/bf527-ad7160-eval_defconfig +1 -0
index 45f4149..ccbb148 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_AD7160_EVAL=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/bf527-ezkit-v2_defconfig +1 -0
index 3677e0a..d247280 100644
@@ -2,6 +2,7 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_EZKIT=y
 CONFIG_SYS_EXTRA_OPTIONS="BF527_EZKIT_REV_2_1"
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
configs/bf527-ezkit_defconfig +1 -0
index da41fe6..f011277 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_EZKIT=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
configs/bf527-sdp_defconfig +1 -0
index fec1307..0c5c4fd 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_SDP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
configs/bf533-ezkit_defconfig +1 -0
index 853a5d4..53cd831 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF533_EZKIT=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
configs/bf533-stamp_defconfig +1 -0
index e0f5de9..f31b54b 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF533_STAMP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
configs/bf537-pnav_defconfig +1 -0
index bbc171d..4fd2936 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_PNAV=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
configs/bf537-stamp_defconfig +1 -0
index d189ad4..b691702 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_STAMP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
configs/bf538f-ezkit_defconfig +1 -0
index 8507b40..4e835cc 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF538F_EZKIT=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
configs/bf548-ezkit_defconfig +1 -0
index 8514d85..19ac4e9 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF548_EZKIT=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
configs/bf561-acvilon_defconfig +1 -0
index 6428d18..744eb1c 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF561_ACVILON=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SYS_PROMPT="Acvilon> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/bf561-ezkit_defconfig +1 -0
index f8206b8..abb612c 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF561_EZKIT=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
configs/br4_defconfig +1 -0
index db5d915..90ce839 100644
@@ -1,5 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BR4=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SYS_PROMPT="br4>"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/chromebook_jerry_defconfig +1 -0
index 3729722..9677e60 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DM_KEYBOARD=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-jerry"
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/cm-bf527_defconfig +1 -0
index 773edfb..bc280a4 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF527=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
configs/cm-bf533_defconfig +1 -0
index 6fa231d..5bc851a 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF533=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
configs/cm-bf537e_defconfig +1 -0
index 16f129b..db636e1 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF537E=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
configs/cm-bf537u_defconfig +1 -0
index 68e8659..f4726b0 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF537U=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
configs/cm-bf548_defconfig +1 -0
index 0589803..bcf6d8f 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF548=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
configs/cm-bf561_defconfig +1 -0
index 5a32f56..3acbc53 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF561=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
configs/cm5200_defconfig +1 -0
index 8b98484..f8e28d9 100644
@@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y
 CONFIG_TARGET_CM5200=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
 CONFIG_CMD_I2C=y
configs/espresso7420_defconfig +1 -0
index e7163d3..e782710 100644
@@ -4,6 +4,7 @@ CONFIG_ARCH_EXYNOS7=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_IDENT_STRING=" for ESPRESSO7420"
 CONFIG_DEFAULT_DEVICE_TREE="exynos7420-espresso7420"
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SYS_PROMPT="ESPRESSO7420 # "
 # CONFIG_AUTOBOOT is not set
 # CONFIG_CMD_IMLS is not set
configs/evb-rk3288_defconfig +1 -0
index c7396a5..7ae03a6 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_EVB_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-evb"
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/fennec-rk3288_defconfig +1 -0
index a5c089b..5d25ee4 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_FENNEC_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-fennec"
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/firefly-rk3288_defconfig +1 -0
index ba461b9..f640fce 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_FIREFLY_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly"
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/fo300_defconfig +1 -0
index e7370d3..697a147 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="FO300"
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
configs/ibf-dsp561_defconfig +1 -0
index 036a92f..c598298 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_IBF_DSP561=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
configs/ip04_defconfig +1 -0
index 277988c..1e05d3e 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_IP04=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_SF=y
configs/ls1021aqds_ddr4_nor_defconfig +1 -0
index 8761b60..2df48c2 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0
index 5bb475e..7951f65 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART"
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_nand_defconfig +1 -0
index 628f2d5..e75297e 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND_BOOT"
 CONFIG_NAND_BOOT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/ls1021aqds_nor_SECURE_BOOT_defconfig +1 -0
index b511eb0..a54cfc6 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_nor_defconfig +1 -0
index a59d339..84ab1bd 100644
@@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_nor_lpuart_defconfig +1 -0
index c7db8b7..074d18e 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="LPUART"
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_qspi_defconfig +1 -0
index 49c88a6..ad40e12 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 CONFIG_QSPI_BOOT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/ls1021aqds_sdcard_ifc_defconfig +1 -0
index f856ad7..6812bfb 100644
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/ls1021aqds_sdcard_qspi_defconfig +1 -0
index 09df451..e226071 100644
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/ls1021atwr_nor_SECURE_BOOT_defconfig +1 -0
index 34cbb4d..e5a0eca 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021atwr_nor_defconfig +1 -0
index 307153f..43ba7fe 100644
@@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021atwr_nor_lpuart_defconfig +1 -0
index 2f95780..8cfaeaf 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="LPUART"
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021atwr_qspi_defconfig +1 -0
index e8ae266..4762425 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 CONFIG_QSPI_BOOT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +1 -0
index fefd174..25760e4 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SECURE_BOOT"
 CONFIG_BOOTDELAY=0
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_CRYPTO_SUPPORT=y
 CONFIG_SPL_HASH_SUPPORT=y
configs/ls1021atwr_sdcard_ifc_defconfig +1 -0
index 68848d8..5f9efdf 100644
@@ -14,6 +14,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/ls1021atwr_sdcard_qspi_defconfig +1 -0
index 9faba8d..e272ea7 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/miniarm-rk3288_defconfig +1 -0
index 6354d1a..557fdfc 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_MINIARM_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-miniarm"
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/odroid-xu3_defconfig +1 -0
index 8164484..eabf22a 100644
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ODROID-XU3 # "
 CONFIG_CMD_BOOTZ=y
configs/pdm360ng_defconfig +1 -0
index f3de685..42f532b 100644
@@ -5,6 +5,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_I2C=y
configs/peach-pi_defconfig +1 -0
index 9472bb0..e5f34a1 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for Peach-Pi"
 CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Peach-Pi # "
configs/peach-pit_defconfig +1 -0
index d208d68..ddcb451 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for Peach-Pit"
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Peach-Pit # "
configs/popmetal-rk3288_defconfig +1 -0
index 112e6ae..d7f60a1 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_POPMETAL_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-popmetal"
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/pr1_defconfig +1 -0
index e7cf5e8..a26ba61 100644
@@ -1,5 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_PR1=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SYS_PROMPT="pr1>"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/rock2_defconfig +1 -0
index fc9ff78..5ba7769 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_ROCK2=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock2-square"
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/sandbox_defconfig +1 -0
index fc9b4ac..143dd09 100644
@@ -16,6 +16,7 @@ CONFIG_BOOTSTAGE_STASH_ADDR=0x0
 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
 CONFIG_CONSOLE_RECORD=y
 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 CONFIG_CMD_LICENSE=y
configs/sandbox_noblk_defconfig +1 -0
index 85610ed..9ad5274 100644
@@ -15,6 +15,7 @@ CONFIG_BOOTSTAGE_STASH_ADDR=0x0
 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
 CONFIG_CONSOLE_RECORD=y
 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
+CONFIG_SILENT_CONSOLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 CONFIG_CMD_LICENSE=y
configs/sandbox_spl_defconfig +1 -0
index ebaf768..cd6f694 100644
@@ -22,6 +22,7 @@ CONFIG_BOOTSTAGE_STASH_ADDR=0x0
 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
 CONFIG_CONSOLE_RECORD=y
 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
configs/smdk5250_defconfig +1 -0
index 6e335f0..de62cb3 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for SMDK5250"
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SMDK5250 # "
configs/smdk5420_defconfig +1 -0
index c1d8c45..04521f2 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for SMDK5420"
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SMDK5420 # "
configs/snow_defconfig +1 -0
index 3d8c8ea..a5754f8 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for snow"
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="snow # "
configs/spring_defconfig +1 -0
index 74287ea..0c394c8 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for spring"
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-spring"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="spring # "
configs/tcm-bf518_defconfig +1 -0
index fd31cfc..9288e56 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_TCM_BF518=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
configs/tcm-bf537_defconfig +1 -0
index d66e499..8459390 100644
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_TCM_BF537=y
 CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
configs/tricorder_defconfig +1 -0
index 281eabb..5bf0c9a 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_TRICORDER=y
 CONFIG_BOOTDELAY=0
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="OMAP3 Tricorder # "
configs/tricorder_flash_defconfig +1 -0
index 7bdf5f5..68d8fb6 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_TRICORDER=y
 CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
 CONFIG_BOOTDELAY=0
+CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMI is not set
include/configs/T102xQDS.h +0 -1
index f7f0acb..eb3cfc0 100644
@@ -34,7 +34,6 @@
 
 #define CONFIG_DEEP_SLEEP
 #if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_SILENT_CONSOLE
 #define CONFIG_BOARD_EARLY_INIT_F
 #endif
 
include/configs/T102xRDB.h +0 -1
index e61c80d..0d6051e 100644
@@ -39,7 +39,6 @@
 #define CONFIG_DEEP_SLEEP
 #endif
 #if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_SILENT_CONSOLE
 #define CONFIG_BOARD_EARLY_INIT_F
 #endif
 
include/configs/T1040QDS.h +0 -1
index 9488db2..d64611a 100644
@@ -46,7 +46,6 @@
 /* support deep sleep */
 #define CONFIG_DEEP_SLEEP
 #if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_SILENT_CONSOLE
 #define CONFIG_BOARD_EARLY_INIT_F
 #endif
 
include/configs/T104xRDB.h +0 -1
index 02633b6..e115bdd 100644
@@ -118,7 +118,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
 #define CONFIG_DEEP_SLEEP
 #if defined(CONFIG_DEEP_SLEEP)
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SILENT_CONSOLE
 #endif
 
 #ifndef CONFIG_SYS_TEXT_BASE
include/configs/TQM5200.h +0 -1
index 14e06fb..814b879 100644
@@ -52,7 +52,6 @@
 
 #ifdef CONFIG_FO300
 #define CONFIG_SYS_DEVICE_NULLDEV		1	/* enable null device */
-#define CONFIG_SILENT_CONSOLE		1	/* enable silent startup */
 #define CONFIG_BOARD_EARLY_INIT_F	1	/* used to detect S1 switch position */
 #define CONFIG_USB_BIN_FIXUP		1	/* for a buggy USB device */
 #if 0
include/configs/UCP1020.h +0 -4
index 57748b4..051d44e 100644
@@ -54,10 +54,6 @@
 
 #define CONFIG_LAST_STAGE_INIT
 
-#if !defined(CONFIG_DONGLE)
-#define CONFIG_SILENT_CONSOLE
-#endif
-
 #endif
 
 #if defined(CONFIG_TARGET_UCP1020)
include/configs/a4m072.h +0 -1
index bdc81ff..96c6826 100644
@@ -36,7 +36,6 @@
 #define CONFIG_BAUDRATE		9600	/* ... at 9600 bps */
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 /* define to enable silent console */
-#define CONFIG_SILENT_CONSOLE
 #define CONFIG_SYS_DEVICE_NULLDEV	1	/* include nulldev device */
 
 /*
include/configs/bfin_adi_common.h +0 -1
index 502ddad..c401b73 100644
@@ -78,7 +78,6 @@
 #define CONFIG_AUTO_COMPLETE	1
 #define CONFIG_LOADS_ECHO	1
 #define CONFIG_JTAG_CONSOLE
-#define CONFIG_SILENT_CONSOLE
 #ifndef CONFIG_BAUDRATE
 # define CONFIG_BAUDRATE	57600
 #endif
include/configs/cm5200.h +0 -1
index 065e700..93ba952 100644
@@ -35,7 +35,6 @@
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		57600	/* ... at 57600 bps */
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_SILENT_CONSOLE	1	/* needed to silence i2c_init() */
 
 /*
  * Ethernet configuration
include/configs/exynos5-common.h +0 -1
index 51a0d19..111b23d 100644
@@ -42,7 +42,6 @@
 /* select serial console configuration */
 #define CONFIG_BAUDRATE			115200
 #define EXYNOS5_DEFAULT_UART_OFFSET	0x010000
-#define CONFIG_SILENT_CONSOLE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_CONSOLE_MUX
 
include/configs/exynos7420-common.h +0 -1
index 9e03962..907b5ea 100644
@@ -54,7 +54,6 @@
 
 /* select serial console configuration */
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SILENT_CONSOLE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_CONSOLE_MUX
 
include/configs/ls1021aqds.h +0 -3
index 0d72e69..a29073c 100644
@@ -22,9 +22,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 
 #define CONFIG_DEEP_SLEEP
-#if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_SILENT_CONSOLE
-#endif
 
 /*
  * Size of malloc() pool
include/configs/ls1021atwr.h +0 -3
index e5ac50e..d3ef614 100644
@@ -21,9 +21,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_DEEP_SLEEP
-#ifdef CONFIG_DEEP_SLEEP
-#define CONFIG_SILENT_CONSOLE
-#endif
 
 /*
  * Size of malloc() pool
include/configs/pdm360ng.h +0 -1
index 6d03d69..e0b4d36 100644
@@ -37,7 +37,6 @@
 
 /* Used for silent command in environment */
 #define CONFIG_SYS_DEVICE_NULLDEV
-#define CONFIG_SILENT_CONSOLE
 
 /* Video */
 #define CONFIG_VIDEO
include/configs/rk3288_common.h +0 -1
index e8bf987..7ac3a5e 100644
@@ -39,7 +39,6 @@
 #define CONFIG_SPL_STACK		0xff718000
 #define CONFIG_SPL_TEXT_BASE		0xff704004
 
-#define CONFIG_SILENT_CONSOLE
 #ifndef CONFIG_SPL_BUILD
 # define CONFIG_SYS_CONSOLE_IS_IN_ENV
 # define CONFIG_CONSOLE_MUX
include/configs/sandbox.h +0 -1
index 94e024b..bd005fc 100644
@@ -67,7 +67,6 @@
 
 #define CONFIG_SYS_LONGHELP			/* #undef to save memory */
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
-#define CONFIG_SILENT_CONSOLE
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
include/configs/tricorder.h +0 -2
index c1c9495..2ae108b 100644
@@ -43,8 +43,6 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
-#define CONFIG_SILENT_CONSOLE
-
 /* Clock Defines */
 #define V_OSCK				26000000 /* Clock output from T2 */
 #define V_SCLK				(V_OSCK >> 1)
scripts/config_whitelist.txt +0 -3
index efa95f0..9e2f00d 100644
@@ -4097,9 +4097,6 @@ CONFIG_SIEMENS_DRACO
 CONFIG_SIEMENS_MACH_TYPE
 CONFIG_SIEMENS_PXM2
 CONFIG_SIEMENS_RUT
-CONFIG_SILENT_CONSOLE
-CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC
-CONFIG_SILENT_CONSOLE_UPDATE_ON_SET
 CONFIG_SIMU
 CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION
 CONFIG_SKIP_LOWLEVEL_INIT
Signature · 1 line
2.8.0.rc3.226.g39d4020
#4 lore raw

PATCH v3 2/29 Convert SILENT_CONSOLE options to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 6 lines

Move these option to Kconfig and tidy up existing uses.

The Power PC boards don't have a suitable common element: the common header files don't appear to line up with the Kconfig files as far as I can tell. This results in a lot of defconfig changes.

Quoted 6 lines

---

Changes in v3: None
Changes in v2:
- Drop the changes to Kconfig defaults

just thought about moving this to Kconfig as I work on a powerpc project ... thanks!

bye,
Heiko

Quoted 1,692 lines
  README                                             |  5 ---
  common/Kconfig                                     | 45 ++++++++++++++++++++++
  configs/T1024QDS_DDR4_SECURE_BOOT_defconfig        |  1 +
  configs/T1024QDS_DDR4_defconfig                    |  1 +
  configs/T1024QDS_NAND_defconfig                    |  1 +
  configs/T1024QDS_SDCARD_defconfig                  |  1 +
  configs/T1024QDS_SECURE_BOOT_defconfig             |  1 +
  configs/T1024QDS_SPIFLASH_defconfig                |  1 +
  configs/T1024QDS_defconfig                         |  1 +
  configs/T1024RDB_NAND_defconfig                    |  1 +
  configs/T1024RDB_SDCARD_defconfig                  |  1 +
  configs/T1024RDB_SECURE_BOOT_defconfig             |  1 +
  configs/T1024RDB_SPIFLASH_defconfig                |  1 +
  configs/T1024RDB_defconfig                         |  1 +
  configs/T1040D4RDB_NAND_defconfig                  |  1 +
  configs/T1040D4RDB_SDCARD_defconfig                |  1 +
  configs/T1040D4RDB_SECURE_BOOT_defconfig           |  1 +
  configs/T1040D4RDB_SPIFLASH_defconfig              |  1 +
  configs/T1040D4RDB_defconfig                       |  1 +
  configs/T1040QDS_DDR4_defconfig                    |  1 +
  configs/T1040QDS_SECURE_BOOT_defconfig             |  1 +
  configs/T1040QDS_defconfig                         |  1 +
  configs/T1040RDB_NAND_defconfig                    |  1 +
  configs/T1040RDB_SDCARD_defconfig                  |  1 +
  configs/T1040RDB_SECURE_BOOT_defconfig             |  1 +
  configs/T1040RDB_SPIFLASH_defconfig                |  1 +
  configs/T1040RDB_defconfig                         |  1 +
  configs/T1042D4RDB_NAND_defconfig                  |  1 +
  configs/T1042D4RDB_SDCARD_defconfig                |  1 +
  configs/T1042D4RDB_SECURE_BOOT_defconfig           |  1 +
  configs/T1042D4RDB_SPIFLASH_defconfig              |  1 +
  configs/T1042D4RDB_defconfig                       |  1 +
  configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig     |  1 +
  configs/T1042RDB_PI_NAND_defconfig                 |  1 +
  configs/T1042RDB_PI_SDCARD_defconfig               |  1 +
  configs/T1042RDB_PI_SPIFLASH_defconfig             |  1 +
  configs/T1042RDB_PI_defconfig                      |  1 +
  configs/T1042RDB_SECURE_BOOT_defconfig             |  1 +
  configs/T1042RDB_defconfig                         |  1 +
  configs/a4m072_defconfig                           |  1 +
  configs/arndale_defconfig                          |  1 +
  configs/bct-brettl2_defconfig                      |  1 +
  configs/bf518f-ezbrd_defconfig                     |  1 +
  configs/bf526-ezbrd_defconfig                      |  1 +
  configs/bf527-ad7160-eval_defconfig                |  1 +
  configs/bf527-ezkit-v2_defconfig                   |  1 +
  configs/bf527-ezkit_defconfig                      |  1 +
  configs/bf527-sdp_defconfig                        |  1 +
  configs/bf533-ezkit_defconfig                      |  1 +
  configs/bf533-stamp_defconfig                      |  1 +
  configs/bf537-pnav_defconfig                       |  1 +
  configs/bf537-stamp_defconfig                      |  1 +
  configs/bf538f-ezkit_defconfig                     |  1 +
  configs/bf548-ezkit_defconfig                      |  1 +
  configs/bf561-acvilon_defconfig                    |  1 +
  configs/bf561-ezkit_defconfig                      |  1 +
  configs/br4_defconfig                              |  1 +
  configs/chromebook_jerry_defconfig                 |  1 +
  configs/cm-bf527_defconfig                         |  1 +
  configs/cm-bf533_defconfig                         |  1 +
  configs/cm-bf537e_defconfig                        |  1 +
  configs/cm-bf537u_defconfig                        |  1 +
  configs/cm-bf548_defconfig                         |  1 +
  configs/cm-bf561_defconfig                         |  1 +
  configs/cm5200_defconfig                           |  1 +
  configs/espresso7420_defconfig                     |  1 +
  configs/evb-rk3288_defconfig                       |  1 +
  configs/fennec-rk3288_defconfig                    |  1 +
  configs/firefly-rk3288_defconfig                   |  1 +
  configs/fo300_defconfig                            |  1 +
  configs/ibf-dsp561_defconfig                       |  1 +
  configs/ip04_defconfig                             |  1 +
  configs/ls1021aqds_ddr4_nor_defconfig              |  1 +
  configs/ls1021aqds_ddr4_nor_lpuart_defconfig       |  1 +
  configs/ls1021aqds_nand_defconfig                  |  1 +
  configs/ls1021aqds_nor_SECURE_BOOT_defconfig       |  1 +
  configs/ls1021aqds_nor_defconfig                   |  1 +
  configs/ls1021aqds_nor_lpuart_defconfig            |  1 +
  configs/ls1021aqds_qspi_defconfig                  |  1 +
  configs/ls1021aqds_sdcard_ifc_defconfig            |  1 +
  configs/ls1021aqds_sdcard_qspi_defconfig           |  1 +
  configs/ls1021atwr_nor_SECURE_BOOT_defconfig       |  1 +
  configs/ls1021atwr_nor_defconfig                   |  1 +
  configs/ls1021atwr_nor_lpuart_defconfig            |  1 +
  configs/ls1021atwr_qspi_defconfig                  |  1 +
  .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig    |  1 +
  configs/ls1021atwr_sdcard_ifc_defconfig            |  1 +
  configs/ls1021atwr_sdcard_qspi_defconfig           |  1 +
  configs/miniarm-rk3288_defconfig                   |  1 +
  configs/odroid-xu3_defconfig                       |  1 +
  configs/pdm360ng_defconfig                         |  1 +
  configs/peach-pi_defconfig                         |  1 +
  configs/peach-pit_defconfig                        |  1 +
  configs/popmetal-rk3288_defconfig                  |  1 +
  configs/pr1_defconfig                              |  1 +
  configs/rock2_defconfig                            |  1 +
  configs/sandbox_defconfig                          |  1 +
  configs/sandbox_noblk_defconfig                    |  1 +
  configs/sandbox_spl_defconfig                      |  1 +
  configs/smdk5250_defconfig                         |  1 +
  configs/smdk5420_defconfig                         |  1 +
  configs/snow_defconfig                             |  1 +
  configs/spring_defconfig                           |  1 +
  configs/tcm-bf518_defconfig                        |  1 +
  configs/tcm-bf537_defconfig                        |  1 +
  configs/tricorder_defconfig                        |  1 +
  configs/tricorder_flash_defconfig                  |  1 +
  include/configs/T102xQDS.h                         |  1 -
  include/configs/T102xRDB.h                         |  1 -
  include/configs/T1040QDS.h                         |  1 -
  include/configs/T104xRDB.h                         |  1 -
  include/configs/TQM5200.h                          |  1 -
  include/configs/UCP1020.h                          |  4 --
  include/configs/a4m072.h                           |  1 -
  include/configs/bfin_adi_common.h                  |  1 -
  include/configs/cm5200.h                           |  1 -
  include/configs/exynos5-common.h                   |  1 -
  include/configs/exynos7420-common.h                |  1 -
  include/configs/ls1021aqds.h                       |  3 --
  include/configs/ls1021atwr.h                       |  3 --
  include/configs/pdm360ng.h                         |  1 -
  include/configs/rk3288_common.h                    |  1 -
  include/configs/sandbox.h                          |  1 -
  include/configs/tricorder.h                        |  2 -
  scripts/config_whitelist.txt                       |  3 --
  125 files changed, 150 insertions(+), 33 deletions(-)
README +0 -5
index bc626dc..0a1f3fe 100644
@@ -853,11 +853,6 @@ The following options need to be configured:
  		default i/o. Serial console can be forced with
  		environment 'console=serial'.
 
-		When CONFIG_SILENT_CONSOLE is defined, all console
-		messages (by U-Boot and Linux!) can be silenced with
-		the "silent" environment variable. See
-		doc/README.silent for more information.
-
  		CONFIG_SYS_CONSOLE_BG_COL: define the backgroundcolor, default
  			is 0x00.
  		CONFIG_SYS_CONSOLE_FG_COL: define the foregroundcolor, default
common/Kconfig +45 -0
index c69c141..bbd5633 100644
@@ -170,6 +170,8 @@ config BOOTDELAY
 
  	  See doc/README.autoboot for details.
 
+menu "Console"
+
  config CONSOLE_RECORD
  	bool "Console recording"
  	help
@@ -203,6 +205,49 @@ config IDENT_STRING
  	help
  	  This options adds the board specific name to u-boot version.
 
+config SILENT_CONSOLE
+	bool "Support a silent console"
+	help
+	  This option allows the console to be silenced, meaning that no
+	  output will appear on the console devices. This is controlled by
+	  setting the environment vaariable 'silent' to a non-empty value.
+	  Note this also silences the console when booting Linux.
+
+	  When the console is set up, the variable is checked, and the
+	  GD_FLG_SILENT flag is set. Changing the environment variable later
+	  will update the flag.
+
+config SILENT_U_BOOT_ONLY
+	bool "Only silence the U-Boot console"
+	depends on SILENT_CONSOLE
+	help
+	  Normally when the U-Boot console is silenced, Linux's console is
+	  also silenced (assuming the board boots into Linux). This option
+	  allows the linux console to operate normally, even if U-Boot's
+	  is silenced.
+
+config SILENT_CONSOLE_UPDATE_ON_SET
+	bool "Changes to the 'silent' environment variable update immediately"
+	depends on SILENT_CONSOLE
+	default y if SILENT_CONSOLE
+	help
+	  When the 'silent' environment variable is changed, update the
+	  console silence flag immediately. This allows 'setenv' to be used
+	  to silence or un-silence the console.
+
+	  The effect is that any change to the variable will affect the
+	  GD_FLG_SILENT flag.
+
+config SILENT_CONSOLE_UPDATE_ON_RELOC
+	bool "Allow flags to take effect on relocation"
+	depends on SILENT_CONSOLE
+	help
+	  In some cases the environment is not available until relocation
+	  (e.g. NAND). This option makes the value of the 'silent'
+	  environment variable take effect at relocation.
+
+endmenu
+
  config SYS_NO_FLASH
  	bool "Disable support for parallel NOR flash"
  	default n
configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +1 -0
index 828bb9b..395330d 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1024QDS_DDR4_defconfig +1 -0
index 7767e0d..fd1f2f0 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1024QDS_NAND_defconfig +1 -0
index 7173342..a62560a 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1024QDS_SDCARD_defconfig +1 -0
index a1c93ae..5a2f3f9 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1024QDS_SECURE_BOOT_defconfig +1 -0
index 371d5f6..04787a0 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1024QDS_SPIFLASH_defconfig +1 -0
index f134850..1a96a63 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1024QDS_defconfig +1 -0
index b0e9827..6f6fc86 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1024RDB_NAND_defconfig +1 -0
index 91beb24..737c648 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1024RDB_SDCARD_defconfig +1 -0
index 11aceb8..444d7f8 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1024RDB_SECURE_BOOT_defconfig +1 -0
index 70961ec..2eada3f 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MEMTEST=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
index 09fe6c4..2c0f761 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1024RDB_defconfig +1 -0
index e013fdc..aa24d57 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MEMTEST=y
configs/T1040D4RDB_NAND_defconfig +1 -0
index e9c7708..b1d1159 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1040D4RDB_SDCARD_defconfig +1 -0
index 098ef3b..5a3a00f 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1040D4RDB_SECURE_BOOT_defconfig +1 -0
index d727450..e437f3e 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1040D4RDB_SPIFLASH_defconfig +1 -0
index 002346a..55671a6 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1040D4RDB_defconfig +1 -0
index fc28d1f..f68d6f2 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1040QDS_DDR4_defconfig +1 -0
index 4f470aa..bda4fb3 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1040QDS_SECURE_BOOT_defconfig +1 -0
index ae6aacf..4ec922a 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1040QDS_defconfig +1 -0
index dd53bb4..6de7d31 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1040RDB_NAND_defconfig +1 -0
index 9e5a409..e144a88 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1040RDB_SDCARD_defconfig +1 -0
index a43304b..aa3f0f8 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1040RDB_SECURE_BOOT_defconfig +1 -0
index e0887de..00e5b12 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT,T1040RDB"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1040RDB_SPIFLASH_defconfig +1 -0
index 1782e07..466bdd7 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1040RDB_defconfig +1 -0
index 28b7bb4..422a738 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1042D4RDB_NAND_defconfig +1 -0
index d2772fe..d631eca 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1042D4RDB_SDCARD_defconfig +1 -0
index f8c5d45..aeea55f 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1042D4RDB_SECURE_BOOT_defconfig +1 -0
index fa3c412..d6ceeba 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index fca6122..66a2c44 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1042D4RDB_defconfig +1 -0
index f611baf..71dabd9 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +1 -0
index aa02cec..6d01cf2 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND,SECURE_BOOT"
  CONFIG_BOOTDELAY=0
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_CRYPTO_SUPPORT=y
  CONFIG_SPL_HASH_SUPPORT=y
configs/T1042RDB_PI_NAND_defconfig +1 -0
index 96985ac..0377d25 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1042RDB_PI_SDCARD_defconfig +1 -0
index fd5da57..1894c62 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1042RDB_PI_SPIFLASH_defconfig +1 -0
index bf41ff5..1cb34a5 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/T1042RDB_PI_defconfig +1 -0
index 7d70b57..ef8332b 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1042RDB_SECURE_BOOT_defconfig +1 -0
index 1539c85..224d1d8 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,SECURE_BOOT,T1042RDB"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/T1042RDB_defconfig +1 -0
index 817c0dc..ee35e43 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
  CONFIG_BOOTDELAY=10
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
configs/a4m072_defconfig +1 -0
index 18dddd9..bf4ac25 100644
@@ -2,6 +2,7 @@ CONFIG_PPC=y
  CONFIG_MPC5xxx=y
  CONFIG_TARGET_A4M072=y
  CONFIG_OF_BOARD_SETUP=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n"
configs/arndale_defconfig +1 -0
index e04ff5b..f78a88c 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for ARNDALE"
  CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="ARNDALE # "
configs/bct-brettl2_defconfig +1 -0
index ad894a2..5dae665 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BCT_BRETTL2=y
  CONFIG_BOOTDELAY=1
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
configs/bf518f-ezbrd_defconfig +1 -0
index e17c969..7f30237 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF518F_EZBRD=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
configs/bf526-ezbrd_defconfig +1 -0
index d3cab9b..663a6a3 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF526_EZBRD=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
configs/bf527-ad7160-eval_defconfig +1 -0
index 45f4149..ccbb148 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF527_AD7160_EVAL=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  # CONFIG_CMD_BOOTD is not set
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
configs/bf527-ezkit-v2_defconfig +1 -0
index 3677e0a..d247280 100644
@@ -2,6 +2,7 @@ CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF527_EZKIT=y
  CONFIG_SYS_EXTRA_OPTIONS="BF527_EZKIT_REV_2_1"
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
configs/bf527-ezkit_defconfig +1 -0
index da41fe6..f011277 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF527_EZKIT=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
configs/bf527-sdp_defconfig +1 -0
index fec1307..0c5c4fd 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF527_SDP=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  # CONFIG_CMD_BOOTD is not set
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
configs/bf533-ezkit_defconfig +1 -0
index 853a5d4..53cd831 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF533_EZKIT=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
configs/bf533-stamp_defconfig +1 -0
index e0f5de9..f31b54b 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF533_STAMP=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
configs/bf537-pnav_defconfig +1 -0
index bbc171d..4fd2936 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF537_PNAV=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
configs/bf537-stamp_defconfig +1 -0
index d189ad4..b691702 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF537_STAMP=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
configs/bf538f-ezkit_defconfig +1 -0
index 8507b40..4e835cc 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF538F_EZKIT=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
configs/bf548-ezkit_defconfig +1 -0
index 8514d85..19ac4e9 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF548_EZKIT=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
configs/bf561-acvilon_defconfig +1 -0
index 6428d18..744eb1c 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF561_ACVILON=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SYS_PROMPT="Acvilon> "
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
configs/bf561-ezkit_defconfig +1 -0
index f8206b8..abb612c 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BF561_EZKIT=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
configs/br4_defconfig +1 -0
index db5d915..90ce839 100644
@@ -1,5 +1,6 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_BR4=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SYS_PROMPT="br4>"
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
configs/chromebook_jerry_defconfig +1 -0
index 3729722..9677e60 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DM_KEYBOARD=y
  CONFIG_DEFAULT_DEVICE_TREE="rk3288-jerry"
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
  CONFIG_HUSH_PARSER=y
configs/cm-bf527_defconfig +1 -0
index 773edfb..bc280a4 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_CM_BF527=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
configs/cm-bf533_defconfig +1 -0
index 6fa231d..5bc851a 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_CM_BF533=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
configs/cm-bf537e_defconfig +1 -0
index 16f129b..db636e1 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_CM_BF537E=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
configs/cm-bf537u_defconfig +1 -0
index 68e8659..f4726b0 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_CM_BF537U=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
configs/cm-bf548_defconfig +1 -0
index 0589803..bcf6d8f 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_CM_BF548=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
configs/cm-bf561_defconfig +1 -0
index 5a32f56..3acbc53 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_CM_BF561=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
configs/cm5200_defconfig +1 -0
index 8b98484..f8e28d9 100644
@@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y
  CONFIG_TARGET_CM5200=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_ASKENV=y
  CONFIG_LOOPW=y
  CONFIG_CMD_I2C=y
configs/espresso7420_defconfig +1 -0
index e7163d3..e782710 100644
@@ -4,6 +4,7 @@ CONFIG_ARCH_EXYNOS7=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_IDENT_STRING=" for ESPRESSO7420"
  CONFIG_DEFAULT_DEVICE_TREE="exynos7420-espresso7420"
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SYS_PROMPT="ESPRESSO7420 # "
  # CONFIG_AUTOBOOT is not set
  # CONFIG_CMD_IMLS is not set
configs/evb-rk3288_defconfig +1 -0
index c7396a5..7ae03a6 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
  CONFIG_TARGET_EVB_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="rk3288-evb"
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
  CONFIG_HUSH_PARSER=y
configs/fennec-rk3288_defconfig +1 -0
index a5c089b..5d25ee4 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
  CONFIG_TARGET_FENNEC_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="rk3288-fennec"
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
  CONFIG_HUSH_PARSER=y
configs/firefly-rk3288_defconfig +1 -0
index ba461b9..f640fce 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
  CONFIG_TARGET_FIREFLY_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly"
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
  CONFIG_HUSH_PARSER=y
configs/fo300_defconfig +1 -0
index e7370d3..697a147 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_TQM5200=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_SYS_EXTRA_OPTIONS="FO300"
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_ASKENV=y
  CONFIG_LOOPW=y
configs/ibf-dsp561_defconfig +1 -0
index 036a92f..c598298 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_IBF_DSP561=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
configs/ip04_defconfig +1 -0
index 277988c..1e05d3e 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_IP04=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_SF=y
configs/ls1021aqds_ddr4_nor_defconfig +1 -0
index 8761b60..2df48c2 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GREPENV=y
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0
index 5bb475e..7951f65 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART"
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GREPENV=y
configs/ls1021aqds_nand_defconfig +1 -0
index 628f2d5..e75297e 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND_BOOT"
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/ls1021aqds_nor_SECURE_BOOT_defconfig +1 -0
index b511eb0..a54cfc6 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GREPENV=y
configs/ls1021aqds_nor_defconfig +1 -0
index a59d339..84ab1bd 100644
@@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GREPENV=y
configs/ls1021aqds_nor_lpuart_defconfig +1 -0
index c7db8b7..074d18e 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="LPUART"
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GREPENV=y
configs/ls1021aqds_qspi_defconfig +1 -0
index 49c88a6..ad40e12 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
  CONFIG_QSPI_BOOT=y
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_IMLS is not set
configs/ls1021aqds_sdcard_ifc_defconfig +1 -0
index f856ad7..6812bfb 100644
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/ls1021aqds_sdcard_qspi_defconfig +1 -0
index 09df451..e226071 100644
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/ls1021atwr_nor_SECURE_BOOT_defconfig +1 -0
index 34cbb4d..e5a0eca 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GREPENV=y
configs/ls1021atwr_nor_defconfig +1 -0
index 307153f..43ba7fe 100644
@@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GREPENV=y
configs/ls1021atwr_nor_lpuart_defconfig +1 -0
index 2f95780..8cfaeaf 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="LPUART"
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GREPENV=y
configs/ls1021atwr_qspi_defconfig +1 -0
index e8ae266..4762425 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
  CONFIG_QSPI_BOOT=y
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_IMLS is not set
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +1 -0
index fefd174..25760e4 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SECURE_BOOT"
  CONFIG_BOOTDELAY=0
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_CRYPTO_SUPPORT=y
  CONFIG_SPL_HASH_SUPPORT=y
configs/ls1021atwr_sdcard_ifc_defconfig +1 -0
index 68848d8..5f9efdf 100644
@@ -14,6 +14,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/ls1021atwr_sdcard_qspi_defconfig +1 -0
index 9faba8d..e272ea7 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
configs/miniarm-rk3288_defconfig +1 -0
index 6354d1a..557fdfc 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
  CONFIG_TARGET_MINIARM_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="rk3288-miniarm"
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
  CONFIG_HUSH_PARSER=y
configs/odroid-xu3_defconfig +1 -0
index 8164484..eabf22a 100644
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="ODROID-XU3 # "
  CONFIG_CMD_BOOTZ=y
configs/pdm360ng_defconfig +1 -0
index f3de685..42f532b 100644
@@ -5,6 +5,7 @@ CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_ASKENV=y
  CONFIG_CMD_I2C=y
configs/peach-pi_defconfig +1 -0
index 9472bb0..e5f34a1 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for Peach-Pi"
  CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="Peach-Pi # "
configs/peach-pit_defconfig +1 -0
index d208d68..ddcb451 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for Peach-Pit"
  CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="Peach-Pit # "
configs/popmetal-rk3288_defconfig +1 -0
index 112e6ae..d7f60a1 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
  CONFIG_TARGET_POPMETAL_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="rk3288-popmetal"
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
  CONFIG_HUSH_PARSER=y
configs/pr1_defconfig +1 -0
index e7cf5e8..a26ba61 100644
@@ -1,5 +1,6 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_PR1=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SYS_PROMPT="pr1>"
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
configs/rock2_defconfig +1 -0
index fc9ff78..5ba7769 100644
@@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3288=y
  CONFIG_TARGET_ROCK2=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock2-square"
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
  CONFIG_HUSH_PARSER=y
configs/sandbox_defconfig +1 -0
index fc9b4ac..143dd09 100644
@@ -16,6 +16,7 @@ CONFIG_BOOTSTAGE_STASH_ADDR=0x0
  CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
  CONFIG_CONSOLE_RECORD=y
  CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_CPU=y
  CONFIG_CMD_LICENSE=y
configs/sandbox_noblk_defconfig +1 -0
index 85610ed..9ad5274 100644
@@ -15,6 +15,7 @@ CONFIG_BOOTSTAGE_STASH_ADDR=0x0
  CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
  CONFIG_CONSOLE_RECORD=y
  CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
+CONFIG_SILENT_CONSOLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_CPU=y
  CONFIG_CMD_LICENSE=y
configs/sandbox_spl_defconfig +1 -0
index ebaf768..cd6f694 100644
@@ -22,6 +22,7 @@ CONFIG_BOOTSTAGE_STASH_ADDR=0x0
  CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
  CONFIG_CONSOLE_RECORD=y
  CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_CPU=y
configs/smdk5250_defconfig +1 -0
index 6e335f0..de62cb3 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for SMDK5250"
  CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="SMDK5250 # "
configs/smdk5420_defconfig +1 -0
index c1d8c45..04521f2 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for SMDK5420"
  CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="SMDK5420 # "
configs/snow_defconfig +1 -0
index 3d8c8ea..a5754f8 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for snow"
  CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="snow # "
configs/spring_defconfig +1 -0
index 74287ea..0c394c8 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING=" for spring"
  CONFIG_DEFAULT_DEVICE_TREE="exynos5250-spring"
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="spring # "
configs/tcm-bf518_defconfig +1 -0
index fd31cfc..9288e56 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_TCM_BF518=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
configs/tcm-bf537_defconfig +1 -0
index d66e499..8459390 100644
@@ -1,6 +1,7 @@
  CONFIG_BLACKFIN=y
  CONFIG_TARGET_TCM_BF537=y
  CONFIG_BOOTDELAY=5
+CONFIG_SILENT_CONSOLE=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_I2C=y
configs/tricorder_defconfig +1 -0
index 281eabb..5bf0c9a 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
  CONFIG_OMAP34XX=y
  CONFIG_TARGET_TRICORDER=y
  CONFIG_BOOTDELAY=0
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="OMAP3 Tricorder # "
configs/tricorder_flash_defconfig +1 -0
index 7bdf5f5..68d8fb6 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
  CONFIG_TARGET_TRICORDER=y
  CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
  CONFIG_BOOTDELAY=0
+CONFIG_SILENT_CONSOLE=y
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y
  # CONFIG_CMD_IMI is not set
include/configs/T102xQDS.h +0 -1
index f7f0acb..eb3cfc0 100644
@@ -34,7 +34,6 @@
 
  #define CONFIG_DEEP_SLEEP
  #if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_SILENT_CONSOLE
  #define CONFIG_BOARD_EARLY_INIT_F
  #endif
 
include/configs/T102xRDB.h +0 -1
index e61c80d..0d6051e 100644
@@ -39,7 +39,6 @@
  #define CONFIG_DEEP_SLEEP
  #endif
  #if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_SILENT_CONSOLE
  #define CONFIG_BOARD_EARLY_INIT_F
  #endif
 
include/configs/T1040QDS.h +0 -1
index 9488db2..d64611a 100644
@@ -46,7 +46,6 @@
  /* support deep sleep */
  #define CONFIG_DEEP_SLEEP
  #if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_SILENT_CONSOLE
  #define CONFIG_BOARD_EARLY_INIT_F
  #endif
 
include/configs/T104xRDB.h +0 -1
index 02633b6..e115bdd 100644
@@ -118,7 +118,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
  #define CONFIG_DEEP_SLEEP
  #if defined(CONFIG_DEEP_SLEEP)
  #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SILENT_CONSOLE
  #endif
 
  #ifndef CONFIG_SYS_TEXT_BASE
include/configs/TQM5200.h +0 -1
index 14e06fb..814b879 100644
@@ -52,7 +52,6 @@
 
  #ifdef CONFIG_FO300
  #define CONFIG_SYS_DEVICE_NULLDEV		1	/* enable null device */
-#define CONFIG_SILENT_CONSOLE		1	/* enable silent startup */
  #define CONFIG_BOARD_EARLY_INIT_F	1	/* used to detect S1 switch position */
  #define CONFIG_USB_BIN_FIXUP		1	/* for a buggy USB device */
  #if 0
include/configs/UCP1020.h +0 -4
index 57748b4..051d44e 100644
@@ -54,10 +54,6 @@
 
  #define CONFIG_LAST_STAGE_INIT
 
-#if !defined(CONFIG_DONGLE)
-#define CONFIG_SILENT_CONSOLE
-#endif
-
  #endif
 
  #if defined(CONFIG_TARGET_UCP1020)
include/configs/a4m072.h +0 -1
index bdc81ff..96c6826 100644
@@ -36,7 +36,6 @@
  #define CONFIG_BAUDRATE		9600	/* ... at 9600 bps */
  #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
  /* define to enable silent console */
-#define CONFIG_SILENT_CONSOLE
  #define CONFIG_SYS_DEVICE_NULLDEV	1	/* include nulldev device */
 
  /*
include/configs/bfin_adi_common.h +0 -1
index 502ddad..c401b73 100644
@@ -78,7 +78,6 @@
  #define CONFIG_AUTO_COMPLETE	1
  #define CONFIG_LOADS_ECHO	1
  #define CONFIG_JTAG_CONSOLE
-#define CONFIG_SILENT_CONSOLE
  #ifndef CONFIG_BAUDRATE
  # define CONFIG_BAUDRATE	57600
  #endif
include/configs/cm5200.h +0 -1
index 065e700..93ba952 100644
@@ -35,7 +35,6 @@
  #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
  #define CONFIG_BAUDRATE		57600	/* ... at 57600 bps */
  #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_SILENT_CONSOLE	1	/* needed to silence i2c_init() */
 
  /*
   * Ethernet configuration
include/configs/exynos5-common.h +0 -1
index 51a0d19..111b23d 100644
@@ -42,7 +42,6 @@
  /* select serial console configuration */
  #define CONFIG_BAUDRATE			115200
  #define EXYNOS5_DEFAULT_UART_OFFSET	0x010000
-#define CONFIG_SILENT_CONSOLE
  #define CONFIG_SYS_CONSOLE_IS_IN_ENV
  #define CONFIG_CONSOLE_MUX
 
include/configs/exynos7420-common.h +0 -1
index 9e03962..907b5ea 100644
@@ -54,7 +54,6 @@
 
  /* select serial console configuration */
  #define CONFIG_BAUDRATE			115200
-#define CONFIG_SILENT_CONSOLE
  #define CONFIG_SYS_CONSOLE_IS_IN_ENV
  #define CONFIG_CONSOLE_MUX
 
include/configs/ls1021aqds.h +0 -3
index 0d72e69..a29073c 100644
@@ -22,9 +22,6 @@
  #define CONFIG_BOARD_EARLY_INIT_F
 
  #define CONFIG_DEEP_SLEEP
-#if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_SILENT_CONSOLE
-#endif
 
  /*
   * Size of malloc() pool
include/configs/ls1021atwr.h +0 -3
index e5ac50e..d3ef614 100644
@@ -21,9 +21,6 @@
  #define CONFIG_SKIP_LOWLEVEL_INIT
  #define CONFIG_BOARD_EARLY_INIT_F
  #define CONFIG_DEEP_SLEEP
-#ifdef CONFIG_DEEP_SLEEP
-#define CONFIG_SILENT_CONSOLE
-#endif
 
  /*
   * Size of malloc() pool
include/configs/pdm360ng.h +0 -1
index 6d03d69..e0b4d36 100644
@@ -37,7 +37,6 @@
 
  /* Used for silent command in environment */
  #define CONFIG_SYS_DEVICE_NULLDEV
-#define CONFIG_SILENT_CONSOLE
 
  /* Video */
  #define CONFIG_VIDEO
include/configs/rk3288_common.h +0 -1
index e8bf987..7ac3a5e 100644
@@ -39,7 +39,6 @@
  #define CONFIG_SPL_STACK		0xff718000
  #define CONFIG_SPL_TEXT_BASE		0xff704004
 
-#define CONFIG_SILENT_CONSOLE
  #ifndef CONFIG_SPL_BUILD
  # define CONFIG_SYS_CONSOLE_IS_IN_ENV
  # define CONFIG_CONSOLE_MUX
include/configs/sandbox.h +0 -1
index 94e024b..bd005fc 100644
@@ -67,7 +67,6 @@
 
  #define CONFIG_SYS_LONGHELP			/* #undef to save memory */
  #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
-#define CONFIG_SILENT_CONSOLE
 
  /* Print Buffer Size */
  #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
include/configs/tricorder.h +0 -2
index c1c9495..2ae108b 100644
@@ -43,8 +43,6 @@
  #define CONFIG_DISPLAY_CPUINFO
  #define CONFIG_DISPLAY_BOARDINFO
 
-#define CONFIG_SILENT_CONSOLE
-
  /* Clock Defines */
  #define V_OSCK				26000000 /* Clock output from T2 */
  #define V_SCLK				(V_OSCK >> 1)
scripts/config_whitelist.txt +0 -3
index efa95f0..9e2f00d 100644
@@ -4097,9 +4097,6 @@ CONFIG_SIEMENS_DRACO
  CONFIG_SIEMENS_MACH_TYPE
  CONFIG_SIEMENS_PXM2
  CONFIG_SIEMENS_RUT
-CONFIG_SILENT_CONSOLE
-CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC
-CONFIG_SILENT_CONSOLE_UPDATE_ON_SET
  CONFIG_SIMU
  CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION
  CONFIG_SKIP_LOWLEVEL_INIT
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#5 lore raw

PATCH v3 2/29 Convert SILENT_CONSOLE options to Kconfig

In reply to Simon Glass
Quoted 7 lines · Simon Glass

Move these option to Kconfig and tidy up existing uses.

The Power PC boards don't have a suitable common element: the common header files don't appear to line up with the Kconfig files as far as I can tell. This results in a lot of defconfig changes.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160930/bb94ec8d/attachment.sig>
#6 lore raw

PATCH v3 3/29 Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig

In reply to Simon Glass

Move these option to Kconfig and tidy up existing uses.

---

Changes in v3: None
Changes in v2:
- Change CONFIG_PRE_CON_BUF_SZ default to 4096
- Change CONFIG_PRE_CON_BUF_SZ to 'int' type
- Drop the depend clause on the CONFIG_PRE_CON_BUF_SZ default
- Move CONFIG_PRE_CON_BUF_ADDR default to common/Kconfig

 README                            | 17 ----------------
 board/sunxi/Kconfig               |  3 +++
 common/Kconfig                    | 42 +++++++++++++++++++++++++++++++++++++++
 common/console.c                  |  6 +++---
 configs/tbs2910_defconfig         |  2 ++
 include/asm-generic/global_data.h |  2 +-
 include/configs/sunxi-common.h    |  6 ------
 include/configs/tbs2910.h         |  4 ----
 scripts/config_whitelist.txt      |  3 ---
 9 files changed, 51 insertions(+), 34 deletions(-)
README +0 -17
index 0a1f3fe..8f93dad 100644
@@ -872,23 +872,6 @@ The following options need to be configured:
 		must be defined, to setup the maximum idle timeout for
 		the SMC.
 
-- Pre-Console Buffer:
-		Prior to the console being initialised (i.e. serial UART
-		initialised etc) all console output is silently discarded.
-		Defining CONFIG_PRE_CONSOLE_BUFFER will cause U-Boot to
-		buffer any console messages prior to the console being
-		initialised to a buffer of size CONFIG_PRE_CON_BUF_SZ
-		bytes located at CONFIG_PRE_CON_BUF_ADDR. The buffer is
-		a circular buffer, so if more than CONFIG_PRE_CON_BUF_SZ
-		bytes are output before the console is initialised, the
-		earlier bytes are discarded.
-
-		Note that when printing the buffer a copy is made on the
-		stack so CONFIG_PRE_CON_BUF_SZ must fit on the stack.
-
-		'Sane' compilers will generate smaller code if
-		CONFIG_PRE_CON_BUF_SZ is a power of 2
-
 - Autoboot Command:
 		CONFIG_BOOTCOMMAND
 		Only needed when CONFIG_BOOTDELAY is enabled;
board/sunxi/Kconfig +3 -0
index b139d1c..c0ffeb3 100644
@@ -3,6 +3,9 @@ if ARCH_SUNXI
 config IDENT_STRING
 	default " Allwinner Technology"
 
+config PRE_CONSOLE_BUFFER
+	default y
+
 config SPL_GPIO_SUPPORT
 	default y
 
common/Kconfig +42 -0

48 lines not on this page · raw message

common/console.c +3 -3
index 12293f3..31a9b3e 100644
@@ -201,7 +201,7 @@ static void console_putc(int file, const char c)
 	}
 }
 
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
 static void console_puts_noserial(int file, const char *s)
 {
 	int i;
@@ -247,7 +247,7 @@ static inline void console_putc(int file, const char c)
 	stdio_devices[file]->putc(stdio_devices[file], c);
 }
 
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
 static inline void console_puts_noserial(int file, const char *s)
 {
 	if (strcmp(stdio_devices[file]->name, "serial") != 0)
@@ -413,7 +413,7 @@ int tstc(void)
 #define PRE_CONSOLE_FLUSHPOINT1_SERIAL			0
 #define PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL	1
 
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
 #define CIRC_BUF_IDX(idx) ((idx) % (unsigned long)CONFIG_PRE_CON_BUF_SZ)
 
 static void pre_console_putc(const char c)
configs/tbs2910_defconfig +2 -0
index fbff9fe..0871408 100644
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TBS2910=y
+CONFIG_PRE_CONSOLE_BUFFER=y
+CONFIG_PRE_CON_BUF_ADDR=0x7c000000
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
 CONFIG_HUSH_PARSER=y
include/asm-generic/global_data.h +1 -1
index dc4cbdb..e02863d 100644
@@ -45,7 +45,7 @@ typedef struct global_data {
 	unsigned long board_type;
 #endif
 	unsigned long have_console;	/* serial_init() was called */
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
 	unsigned long precon_buf_idx;	/* Pre-Console buffer index */
 #endif
 	unsigned long env_addr;		/* Address  of Environment struct */
include/configs/sunxi-common.h +0 -6
index d261fb3..c604ce2 100644
@@ -69,7 +69,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x20000000
 #define CONFIG_SYS_LOAD_ADDR		0x22000000 /* default load address */
 #define CONFIG_SYS_TEXT_BASE		0x2a000000
-#define CONFIG_PRE_CON_BUF_ADDR		0x2f000000
 /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here 
  * since it needs to fit in with the other values. By also #defining it
  * we get warnings if the Kconfig value mismatches. */
@@ -80,7 +79,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x40000000
 #define CONFIG_SYS_LOAD_ADDR		0x42000000 /* default load address */
 #define CONFIG_SYS_TEXT_BASE		0x4a000000
-#define CONFIG_PRE_CON_BUF_ADDR		0x4f000000
 /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here 
  * since it needs to fit in with the other values. By also #defining it
  * we get warnings if the Kconfig value mismatches. */
@@ -373,10 +371,6 @@ extern int soft_i2c_gpio_scl;
 #ifndef CONFIG_SPL_BUILD
 #include <config_distro_defaults.h>
 
-/* Enable pre-console buffer to get complete log on the VGA console */
-#define CONFIG_PRE_CONSOLE_BUFFER
-#define CONFIG_PRE_CON_BUF_SZ		4096 /* Aprox 2 80*25 screens */
-
 #ifdef CONFIG_ARM64
 /*
  * Boards seem to come with at least 512MB of DRAM.
include/configs/tbs2910.h +0 -4
index 85501bc..ddd53dd 100644
@@ -50,10 +50,6 @@
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_CONS_INDEX		1
 
-#define CONFIG_PRE_CONSOLE_BUFFER
-#define CONFIG_PRE_CON_BUF_SZ		4096
-#define CONFIG_PRE_CON_BUF_ADDR		0x7C000000
-
 /* *** Command definition *** */
 #define CONFIG_CMD_BMODE
 
scripts/config_whitelist.txt +0 -3
index 9e2f00d..7a69be5 100644
@@ -3728,9 +3728,6 @@ CONFIG_PQ_MDS_PIB
 CONFIG_PQ_MDS_PIB_ATM
 CONFIG_PRAM
 CONFIG_PREBOOT
-CONFIG_PRE_CONSOLE_BUFFER
-CONFIG_PRE_CON_BUF_ADDR
-CONFIG_PRE_CON_BUF_SZ
 CONFIG_PRIMEVIEW_V16C6448AC
 CONFIG_PRINTK
 CONFIG_PROC_FS
Signature · 1 line
2.8.0.rc3.226.g39d4020
#7 lore raw

PATCH v3 3/29 Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 12 lines

Move these option to Kconfig and tidy up existing uses.

---

Changes in v3: None
Changes in v2:
- Change CONFIG_PRE_CON_BUF_SZ default to 4096
- Change CONFIG_PRE_CON_BUF_SZ to 'int' type
- Drop the depend clause on the CONFIG_PRE_CON_BUF_SZ default
- Move CONFIG_PRE_CON_BUF_ADDR default to common/Kconfig

Quoted 10 lines
  README                            | 17 ----------------
  board/sunxi/Kconfig               |  3 +++
  common/Kconfig                    | 42 +++++++++++++++++++++++++++++++++++++++
  common/console.c                  |  6 +++---
  configs/tbs2910_defconfig         |  2 ++
  include/asm-generic/global_data.h |  2 +-
  include/configs/sunxi-common.h    |  6 ------
  include/configs/tbs2910.h         |  4 ----
  scripts/config_whitelist.txt      |  3 ---
  9 files changed, 51 insertions(+), 34 deletions(-)

bye,
Heiko

Quoted 214 lines
README +0 -17
index 0a1f3fe..8f93dad 100644
@@ -872,23 +872,6 @@ The following options need to be configured:
  		must be defined, to setup the maximum idle timeout for
  		the SMC.
 
-- Pre-Console Buffer:
-		Prior to the console being initialised (i.e. serial UART
-		initialised etc) all console output is silently discarded.
-		Defining CONFIG_PRE_CONSOLE_BUFFER will cause U-Boot to
-		buffer any console messages prior to the console being
-		initialised to a buffer of size CONFIG_PRE_CON_BUF_SZ
-		bytes located at CONFIG_PRE_CON_BUF_ADDR. The buffer is
-		a circular buffer, so if more than CONFIG_PRE_CON_BUF_SZ
-		bytes are output before the console is initialised, the
-		earlier bytes are discarded.
-
-		Note that when printing the buffer a copy is made on the
-		stack so CONFIG_PRE_CON_BUF_SZ must fit on the stack.
-
-		'Sane' compilers will generate smaller code if
-		CONFIG_PRE_CON_BUF_SZ is a power of 2
-
  - Autoboot Command:
  		CONFIG_BOOTCOMMAND
  		Only needed when CONFIG_BOOTDELAY is enabled;
board/sunxi/Kconfig +3 -0
index b139d1c..c0ffeb3 100644
@@ -3,6 +3,9 @@ if ARCH_SUNXI
  config IDENT_STRING
  	default " Allwinner Technology"
 
+config PRE_CONSOLE_BUFFER
+	default y
+
  config SPL_GPIO_SUPPORT
  	default y
 
common/Kconfig +42 -0
index bbd5633..6ee67ac 100644
@@ -246,6 +246,48 @@ config SILENT_CONSOLE_UPDATE_ON_RELOC
  	  (e.g. NAND). This option makes the value of the 'silent'
  	  environment variable take effect at relocation.
 
+config PRE_CONSOLE_BUFFER
+	bool "Buffer characters before the console is available"
+	help
+	  Prior to the console being initialised (i.e. serial UART
+	  initialised etc) all console output is silently discarded.
+	  Defining CONFIG_PRE_CONSOLE_BUFFER will cause U-Boot to
+	  buffer any console messages prior to the console being
+	  initialised to a buffer. The buffer is a circular buffer, so
+	  if it overflows, earlier output is discarded.
+
+	  Note that this is not currently supported in SPL. It would be
+	  useful to be able to share the pre-console buffer with SPL.
+
+config PRE_CON_BUF_SZ
+	int "Sets the size of the pre-console buffer"
+	depends on PRE_CONSOLE_BUFFER
+	default 4096
+	help
+	  The size of the pre-console buffer affects how much console output
+	  can be held before it overflows and starts discarding earlier
+	  output. Normally there is very little output at this early stage,
+	  unless debugging is enabled, so allow enough for ~10 lines of
+	  text.
+
+	  This is a useful feature if you are using a video console and
+	  want to see the full boot output on the console. Without this
+	  option only the post-relocation output will be displayed.
+
+config PRE_CON_BUF_ADDR
+	hex "Address of the pre-console buffer"
+	depends on PRE_CONSOLE_BUFFER
+	default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
+	default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
+	help
+	  This sets the start address of the pre-console buffer. This must
+	  be in available memory and is accessed before relocation and
+	  possibly before DRAM is set up. Therefore choose an address
+	  carefully.
+
+	  We should consider removing this option and allocating the memory
+	  in board_init_f_init_reserve() instead.
+
  endmenu
 
  config SYS_NO_FLASH
common/console.c +3 -3
index 12293f3..31a9b3e 100644
@@ -201,7 +201,7 @@ static void console_putc(int file, const char c)
  	}
  }
 
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
  static void console_puts_noserial(int file, const char *s)
  {
  	int i;
@@ -247,7 +247,7 @@ static inline void console_putc(int file, const char c)
  	stdio_devices[file]->putc(stdio_devices[file], c);
  }
 
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
  static inline void console_puts_noserial(int file, const char *s)
  {
  	if (strcmp(stdio_devices[file]->name, "serial") != 0)
@@ -413,7 +413,7 @@ int tstc(void)
  #define PRE_CONSOLE_FLUSHPOINT1_SERIAL			0
  #define PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL	1
 
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
  #define CIRC_BUF_IDX(idx) ((idx) % (unsigned long)CONFIG_PRE_CON_BUF_SZ)
 
  static void pre_console_putc(const char c)
configs/tbs2910_defconfig +2 -0
index fbff9fe..0871408 100644
@@ -1,6 +1,8 @@
  CONFIG_ARM=y
  CONFIG_ARCH_MX6=y
  CONFIG_TARGET_TBS2910=y
+CONFIG_PRE_CONSOLE_BUFFER=y
+CONFIG_PRE_CON_BUF_ADDR=0x7c000000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_HUSH_PARSER=y
include/asm-generic/global_data.h +1 -1
index dc4cbdb..e02863d 100644
@@ -45,7 +45,7 @@ typedef struct global_data {
  	unsigned long board_type;
  #endif
  	unsigned long have_console;	/* serial_init() was called */
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
  	unsigned long precon_buf_idx;	/* Pre-Console buffer index */
  #endif
  	unsigned long env_addr;		/* Address  of Environment struct */
include/configs/sunxi-common.h +0 -6
index d261fb3..c604ce2 100644
@@ -69,7 +69,6 @@
  #define CONFIG_SYS_SDRAM_BASE		0x20000000
  #define CONFIG_SYS_LOAD_ADDR		0x22000000 /* default load address */
  #define CONFIG_SYS_TEXT_BASE		0x2a000000
-#define CONFIG_PRE_CON_BUF_ADDR		0x2f000000
  /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here
   * since it needs to fit in with the other values. By also #defining it
   * we get warnings if the Kconfig value mismatches. */
@@ -80,7 +79,6 @@
  #define CONFIG_SYS_SDRAM_BASE		0x40000000
  #define CONFIG_SYS_LOAD_ADDR		0x42000000 /* default load address */
  #define CONFIG_SYS_TEXT_BASE		0x4a000000
-#define CONFIG_PRE_CON_BUF_ADDR		0x4f000000
  /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here
   * since it needs to fit in with the other values. By also #defining it
   * we get warnings if the Kconfig value mismatches. */
@@ -373,10 +371,6 @@ extern int soft_i2c_gpio_scl;
  #ifndef CONFIG_SPL_BUILD
  #include <config_distro_defaults.h>
 
-/* Enable pre-console buffer to get complete log on the VGA console */
-#define CONFIG_PRE_CONSOLE_BUFFER
-#define CONFIG_PRE_CON_BUF_SZ		4096 /* Aprox 2 80*25 screens */
-
  #ifdef CONFIG_ARM64
  /*
   * Boards seem to come with at least 512MB of DRAM.
include/configs/tbs2910.h +0 -4
index 85501bc..ddd53dd 100644
@@ -50,10 +50,6 @@
  #define CONFIG_CONSOLE_MUX
  #define CONFIG_CONS_INDEX		1
 
-#define CONFIG_PRE_CONSOLE_BUFFER
-#define CONFIG_PRE_CON_BUF_SZ		4096
-#define CONFIG_PRE_CON_BUF_ADDR		0x7C000000
-
  /* *** Command definition *** */
  #define CONFIG_CMD_BMODE
 
scripts/config_whitelist.txt +0 -3
index 9e2f00d..7a69be5 100644
@@ -3728,9 +3728,6 @@ CONFIG_PQ_MDS_PIB
  CONFIG_PQ_MDS_PIB_ATM
  CONFIG_PRAM
  CONFIG_PREBOOT
-CONFIG_PRE_CONSOLE_BUFFER
-CONFIG_PRE_CON_BUF_ADDR
-CONFIG_PRE_CON_BUF_SZ
  CONFIG_PRIMEVIEW_V16C6448AC
  CONFIG_PRINTK
  CONFIG_PROC_FS
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#8 lore raw

PATCH v3 3/29 Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig

In reply to Simon Glass

Hello Simon,

Quoted 11 lines · On Thu, 29 Sep 2016 14:23:02 -0600 Simon Glass <[email protected]> wrote:

Move these option to Kconfig and tidy up existing uses.

---

Changes in v3: None
Changes in v2:
- Change CONFIG_PRE_CON_BUF_SZ default to 4096
- Change CONFIG_PRE_CON_BUF_SZ to 'int' type
- Drop the depend clause on the CONFIG_PRE_CON_BUF_SZ default
- Move CONFIG_PRE_CON_BUF_ADDR default to common/Kconfig

What is the point moving these defines to Kconfig? They are neither user configurable, nor board specific. The location of the buffer is defined per platform or per SoC type and is a part of the global memory map. Similar to such things as the malloc heap and the stack.

Allowing the users to redefine the buffer location is a dangerous thing because everything may go out of control very easily (it may overlap with some other memory buffer). IMHO it only makes sense to have a single user configurable boolean flag in Kconfig (the one which enables/disables the pre-console functionality).

Regarding the buffer size. It was originally picked rather arbitrarily as 1MB at least for the sunxi platform:

    https://patchwork.ozlabs.org/patch/426526/

Just because making it several orders of magnitude larger than necessary makes it extremely unlikely that anyone ever gets into a buffer wraparound situation. Picking smallish sizes does not gain us anything, but just adds an extra hassle because now one needs to make some estimations whether the size is large enough or not. Especially considering that this functionality may be sometimes used for debugging prints when troubleshooting something. And one can't easily predict how much debugging output would be actually necessary.

Quoted 63 lines
 README                            | 17 ----------------
 board/sunxi/Kconfig               |  3 +++
 common/Kconfig                    | 42 +++++++++++++++++++++++++++++++++++++++
 common/console.c                  |  6 +++---
 configs/tbs2910_defconfig         |  2 ++
 include/asm-generic/global_data.h |  2 +-
 include/configs/sunxi-common.h    |  6 ------
 include/configs/tbs2910.h         |  4 ----
 scripts/config_whitelist.txt      |  3 ---
 9 files changed, 51 insertions(+), 34 deletions(-)
README +0 -17
index 0a1f3fe..8f93dad 100644
@@ -872,23 +872,6 @@ The following options need to be configured:
 		must be defined, to setup the maximum idle timeout for
 		the SMC.
 
-- Pre-Console Buffer:
-		Prior to the console being initialised (i.e. serial UART
-		initialised etc) all console output is silently discarded.
-		Defining CONFIG_PRE_CONSOLE_BUFFER will cause U-Boot to
-		buffer any console messages prior to the console being
-		initialised to a buffer of size CONFIG_PRE_CON_BUF_SZ
-		bytes located at CONFIG_PRE_CON_BUF_ADDR. The buffer is
-		a circular buffer, so if more than CONFIG_PRE_CON_BUF_SZ
-		bytes are output before the console is initialised, the
-		earlier bytes are discarded.
-
-		Note that when printing the buffer a copy is made on the
-		stack so CONFIG_PRE_CON_BUF_SZ must fit on the stack.
-
-		'Sane' compilers will generate smaller code if
-		CONFIG_PRE_CON_BUF_SZ is a power of 2
-
 - Autoboot Command:
 		CONFIG_BOOTCOMMAND
 		Only needed when CONFIG_BOOTDELAY is enabled;
board/sunxi/Kconfig +3 -0
index b139d1c..c0ffeb3 100644
@@ -3,6 +3,9 @@ if ARCH_SUNXI
 config IDENT_STRING
 	default " Allwinner Technology"
 
+config PRE_CONSOLE_BUFFER
+	default y
+
 config SPL_GPIO_SUPPORT
 	default y
 
common/Kconfig +2 -0
index bbd5633..6ee67ac 100644
@@ -246,6 +246,48 @@ config SILENT_CONSOLE_UPDATE_ON_RELOC
 	  (e.g. NAND). This option makes the value of the 'silent'
 	  environment variable take effect at relocation.
 
+config PRE_CONSOLE_BUFFER
+	bool "Buffer characters before the console is available"

common/Kconfig config SILENT_CONSOLE_UPDATE_ON_RELOC · line 260

Quoted 10 lines
common/Kconfig +10 -0
+	help
+	  Prior to the console being initialised (i.e. serial UART
+	  initialised etc) all console output is silently discarded.
+	  Defining CONFIG_PRE_CONSOLE_BUFFER will cause U-Boot to
+	  buffer any console messages prior to the console being
+	  initialised to a buffer. The buffer is a circular buffer, so
+	  if it overflows, earlier output is discarded.
+
+	  Note that this is not currently supported in SPL. It would be
+	  useful to be able to share the pre-console buffer with SPL.

We can't (easily) share this buffer with SPL. In the SPL case, this buffer needs to be placed somewhere in SRAM, because it is necessary to also have console messages even before DRAM is initialized. Essentially, we want to have two separate buffers. One small buffer somewhere in SRAM for SPL, and one very large buffer somewhere in DRAM for U-Boot proper. The data from the small buffer gets combined with the data from the large buffer at some point. The actual implementation is very straightforward and simple. And in fact it has been already available since a long time ago:

    http://lists.denx.de/pipermail/u-boot/2015-January/201127.html
    http://lists.denx.de/pipermail/u-boot/2015-January/201128.html
    http://lists.denx.de/pipermail/u-boot/2015-January/201129.html

Again, assigning the exact location of these buffers is a very platform specific information and is a part of the memory map. The user has no business overriding this via Kconfig.

BTW, would you want me to rebase these old patches on the current U-Boot git master branch?

Quoted 19 lines
common/Kconfig +19 -0
+
+config PRE_CON_BUF_SZ
+	int "Sets the size of the pre-console buffer"
+	depends on PRE_CONSOLE_BUFFER
+	default 4096
+	help
+	  The size of the pre-console buffer affects how much console output
+	  can be held before it overflows and starts discarding earlier
+	  output. Normally there is very little output at this early stage,
+	  unless debugging is enabled, so allow enough for ~10 lines of
+	  text.
+
+	  This is a useful feature if you are using a video console and
+	  want to see the full boot output on the console. Without this
+	  option only the post-relocation output will be displayed.
+
+config PRE_CON_BUF_ADDR
+	hex "Address of the pre-console buffer"
+	depends on PRE_CONSOLE_BUFFER

common/Kconfig config SILENT_CONSOLE_UPDATE_ON_RELOC · line 289

Quoted 10 lines
common/Kconfig +10 -0
+	default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
+	default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
+	help
+	  This sets the start address of the pre-console buffer. This must
+	  be in available memory and is accessed before relocation and
+	  possibly before DRAM is set up. Therefore choose an address
+	  carefully.
+
+	  We should consider removing this option and allocating the memory
+	  in board_init_f_init_reserve() instead.

And what is the profit? The implementation becomes more complex, more fragile and defeats the whole purpose. We want to be able to print and accumulate debugging messages immediately, and not only after certain things are initialized relatively late in the boot process. That's exactly the reason why this pre-console buffer functionality exists in the first place.

Quoted 120 lines
common/Kconfig +0 -0
 endmenu
 
 config SYS_NO_FLASH
common/console.c +3 -3
index 12293f3..31a9b3e 100644
@@ -201,7 +201,7 @@ static void console_putc(int file, const char c)
 	}
 }
 
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
 static void console_puts_noserial(int file, const char *s)
 {
 	int i;
@@ -247,7 +247,7 @@ static inline void console_putc(int file, const char c)
 	stdio_devices[file]->putc(stdio_devices[file], c);
 }
 
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
 static inline void console_puts_noserial(int file, const char *s)
 {
 	if (strcmp(stdio_devices[file]->name, "serial") != 0)
@@ -413,7 +413,7 @@ int tstc(void)
 #define PRE_CONSOLE_FLUSHPOINT1_SERIAL			0
 #define PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL	1
 
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
 #define CIRC_BUF_IDX(idx) ((idx) % (unsigned long)CONFIG_PRE_CON_BUF_SZ)
 
 static void pre_console_putc(const char c)
configs/tbs2910_defconfig +2 -0
index fbff9fe..0871408 100644
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TBS2910=y
+CONFIG_PRE_CONSOLE_BUFFER=y
+CONFIG_PRE_CON_BUF_ADDR=0x7c000000
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
 CONFIG_HUSH_PARSER=y
include/asm-generic/global_data.h +1 -1
index dc4cbdb..e02863d 100644
@@ -45,7 +45,7 @@ typedef struct global_data {
 	unsigned long board_type;
 #endif
 	unsigned long have_console;	/* serial_init() was called */
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
+#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
 	unsigned long precon_buf_idx;	/* Pre-Console buffer index */
 #endif
 	unsigned long env_addr;		/* Address  of Environment struct */
include/configs/sunxi-common.h +0 -6
index d261fb3..c604ce2 100644
@@ -69,7 +69,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x20000000
 #define CONFIG_SYS_LOAD_ADDR		0x22000000 /* default load address */
 #define CONFIG_SYS_TEXT_BASE		0x2a000000
-#define CONFIG_PRE_CON_BUF_ADDR		0x2f000000
 /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here 
  * since it needs to fit in with the other values. By also #defining it
  * we get warnings if the Kconfig value mismatches. */
@@ -80,7 +79,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x40000000
 #define CONFIG_SYS_LOAD_ADDR		0x42000000 /* default load address */
 #define CONFIG_SYS_TEXT_BASE		0x4a000000
-#define CONFIG_PRE_CON_BUF_ADDR		0x4f000000
 /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here 
  * since it needs to fit in with the other values. By also #defining it
  * we get warnings if the Kconfig value mismatches. */
@@ -373,10 +371,6 @@ extern int soft_i2c_gpio_scl;
 #ifndef CONFIG_SPL_BUILD
 #include <config_distro_defaults.h>
 
-/* Enable pre-console buffer to get complete log on the VGA console */
-#define CONFIG_PRE_CONSOLE_BUFFER
-#define CONFIG_PRE_CON_BUF_SZ		4096 /* Aprox 2 80*25 screens */
-
 #ifdef CONFIG_ARM64
 /*
  * Boards seem to come with at least 512MB of DRAM.
include/configs/tbs2910.h +0 -4
index 85501bc..ddd53dd 100644
@@ -50,10 +50,6 @@
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_CONS_INDEX		1
 
-#define CONFIG_PRE_CONSOLE_BUFFER
-#define CONFIG_PRE_CON_BUF_SZ		4096
-#define CONFIG_PRE_CON_BUF_ADDR		0x7C000000
-
 /* *** Command definition *** */
 #define CONFIG_CMD_BMODE
 
scripts/config_whitelist.txt +0 -3
index 9e2f00d..7a69be5 100644
@@ -3728,9 +3728,6 @@ CONFIG_PQ_MDS_PIB
 CONFIG_PQ_MDS_PIB_ATM
 CONFIG_PRAM
 CONFIG_PREBOOT
-CONFIG_PRE_CONSOLE_BUFFER
-CONFIG_PRE_CON_BUF_ADDR
-CONFIG_PRE_CON_BUF_SZ
 CONFIG_PRIMEVIEW_V16C6448AC
 CONFIG_PRINTK
 CONFIG_PROC_FS
Signature · 2 lines
Best regards,
Siarhei Siamashka
#9 lore raw

PATCH v3 3/29 Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig

Quoted 17 lines · Siarhei Siamashka

Hello Simon,

Quoted 11 lines · On Thu, 29 Sep 2016 14:23:02 -0600 Simon Glass <[email protected]> wrote:

Move these option to Kconfig and tidy up existing uses.

---

Changes in v3: None
Changes in v2:
- Change CONFIG_PRE_CON_BUF_SZ default to 4096
- Change CONFIG_PRE_CON_BUF_SZ to 'int' type
- Drop the depend clause on the CONFIG_PRE_CON_BUF_SZ default
- Move CONFIG_PRE_CON_BUF_ADDR default to common/Kconfig

Quoted 4 lines

What is the point moving these defines to Kconfig? They are neither user configurable, nor board specific. The location of the buffer is defined per platform or per SoC type and is a part of the global memory map. Similar to such things as the malloc heap and the stack.

This is a good point to bring up. As we're discussing in another thread about moving FSL things out of CONFIG_SYS_... and into Kconfig or a different namespace, we have other examples today where there's addresses in Kconfig. Looking harder still at this code, perhaps as a follow-up CONFIG_PRE_CON_BUF_SZ should just be 'PRE_CON_BUF_SIZE' in the code and 4096, and not in Kconfig at all. And for this series, make the default tbs2910 uses the default for ARCH_MX6.

Quoted 11 lines

Allowing the users to redefine the buffer location is a dangerous thing because everything may go out of control very easily (it may overlap with some other memory buffer). IMHO it only makes sense to have a single user configurable boolean flag in Kconfig (the one which enables/disables the pre-console functionality).

Regarding the buffer size. It was originally picked rather arbitrarily as 1MB at least for the sunxi platform:

    https://patchwork.ozlabs.org/patch/426526/
Quoted 9 lines

Just because making it several orders of magnitude larger than necessary makes it extremely unlikely that anyone ever gets into a buffer wraparound situation. Picking smallish sizes does not gain us anything, but just adds an extra hassle because now one needs to make some estimations whether the size is large enough or not. Especially considering that this functionality may be sometimes used for debugging prints when troubleshooting something. And one can't easily predict how much debugging output would be actually necessary.

So maybe we should hide the size option under EXPERT?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160930/243769a8/attachment.sig>
#10 lore raw

PATCH v3 3/29 Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig

In reply to Siarhei Siamashka

Hi Siarhei,

Quoted 34 lines · Siarhei Siamashka

Hello Simon,

Quoted 11 lines · On Thu, 29 Sep 2016 14:23:02 -0600 Simon Glass <[email protected]> wrote:

Move these option to Kconfig and tidy up existing uses.

---

Changes in v3: None
Changes in v2:
- Change CONFIG_PRE_CON_BUF_SZ default to 4096
- Change CONFIG_PRE_CON_BUF_SZ to 'int' type
- Drop the depend clause on the CONFIG_PRE_CON_BUF_SZ default
- Move CONFIG_PRE_CON_BUF_ADDR default to common/Kconfig

What is the point moving these defines to Kconfig? They are neither user configurable, nor board specific. The location of the buffer is defined per platform or per SoC type and is a part of the global memory map. Similar to such things as the malloc heap and the stack.

Allowing the users to redefine the buffer location is a dangerous thing because everything may go out of control very easily (it may overlap with some other memory buffer). IMHO it only makes sense to have a single user configurable boolean flag in Kconfig (the one which enables/disables the pre-console functionality).

Regarding the buffer size. It was originally picked rather arbitrarily as 1MB at least for the sunxi platform:

    https://patchwork.ozlabs.org/patch/426526/
Quoted 9 lines

Just because making it several orders of magnitude larger than necessary makes it extremely unlikely that anyone ever gets into a buffer wraparound situation. Picking smallish sizes does not gain us anything, but just adds an extra hassle because now one needs to make some estimations whether the size is large enough or not. Especially considering that this functionality may be sometimes used for debugging prints when troubleshooting something. And one can't easily predict how much debugging output would be actually necessary.

All CONFIGs need to move to Kconfig or be deleted.

I also don't like the idea of specifying an address for a pre-console buffer. As mentioned I think it is better to allocate it automatically. But that is a separate issue from the Kconfig conversion. if we re-litigate every CONFIG that we move, it will never happen.

Quoted 89 lines
Quoted 64 lines
 README                            | 17 ----------------
 board/sunxi/Kconfig               |  3 +++
 common/Kconfig                    | 42 +++++++++++++++++++++++++++++++++++++++
 common/console.c                  |  6 +++---
 configs/tbs2910_defconfig         |  2 ++
 include/asm-generic/global_data.h |  2 +-
 include/configs/sunxi-common.h    |  6 ------
 include/configs/tbs2910.h         |  4 ----
 scripts/config_whitelist.txt      |  3 ---
 9 files changed, 51 insertions(+), 34 deletions(-)
README +0 -17
index 0a1f3fe..8f93dad 100644
@@ -872,23 +872,6 @@ The following options need to be configured:
              must be defined, to setup the maximum idle timeout for
              the SMC.
 
-- Pre-Console Buffer:
-             Prior to the console being initialised (i.e. serial UART
-             initialised etc) all console output is silently discarded.
-             Defining CONFIG_PRE_CONSOLE_BUFFER will cause U-Boot to
-             buffer any console messages prior to the console being
-             initialised to a buffer of size CONFIG_PRE_CON_BUF_SZ
-             bytes located at CONFIG_PRE_CON_BUF_ADDR. The buffer is
-             a circular buffer, so if more than CONFIG_PRE_CON_BUF_SZ
-             bytes are output before the console is initialised, the
-             earlier bytes are discarded.
-
-             Note that when printing the buffer a copy is made on the
-             stack so CONFIG_PRE_CON_BUF_SZ must fit on the stack.
-
-             'Sane' compilers will generate smaller code if
-             CONFIG_PRE_CON_BUF_SZ is a power of 2
-
 - Autoboot Command:
              CONFIG_BOOTCOMMAND
              Only needed when CONFIG_BOOTDELAY is enabled;
board/sunxi/Kconfig +3 -0
index b139d1c..c0ffeb3 100644
@@ -3,6 +3,9 @@ if ARCH_SUNXI
 config IDENT_STRING
      default " Allwinner Technology"
 
+config PRE_CONSOLE_BUFFER
+     default y
+
 config SPL_GPIO_SUPPORT
      default y
 
common/Kconfig +2 -0
index bbd5633..6ee67ac 100644
@@ -246,6 +246,48 @@ config SILENT_CONSOLE_UPDATE_ON_RELOC
        (e.g. NAND). This option makes the value of the 'silent'
        environment variable take effect at relocation.
 
+config PRE_CONSOLE_BUFFER
+     bool "Buffer characters before the console is available"

common/Kconfig config SILENT_CONSOLE_UPDATE_ON_RELOC · line 260

Quoted 10 lines
common/Kconfig +10 -0
+     help
+       Prior to the console being initialised (i.e. serial UART
+       initialised etc) all console output is silently discarded.
+       Defining CONFIG_PRE_CONSOLE_BUFFER will cause U-Boot to
+       buffer any console messages prior to the console being
+       initialised to a buffer. The buffer is a circular buffer, so
+       if it overflows, earlier output is discarded.
+
+       Note that this is not currently supported in SPL. It would be
+       useful to be able to share the pre-console buffer with SPL.

We can't (easily) share this buffer with SPL. In the SPL case, this buffer needs to be placed somewhere in SRAM, because it is necessary to also have console messages even before DRAM is initialized. Essentially, we want to have two separate buffers. One small buffer somewhere in SRAM for SPL, and one very large buffer somewhere in DRAM for U-Boot proper. The data from the small buffer gets combined with the data from the large buffer at some point. The actual implementation is very straightforward and simple. And in fact it has been already available since a long time ago:

    http://lists.denx.de/pipermail/u-boot/2015-January/201127.html
    http://lists.denx.de/pipermail/u-boot/2015-January/201128.html
    http://lists.denx.de/pipermail/u-boot/2015-January/201129.html
Quoted 6 lines

Again, assigning the exact location of these buffers is a very platform specific information and is a part of the memory map. The user has no business overriding this via Kconfig.

BTW, would you want me to rebase these old patches on the current U-Boot git master branch?

Yes please. I'd like to see this setup moved to board_init.c, with just a size CONFIG options, not an address.

Quoted 29 lines
Quoted 29 lines
common/Kconfig +28 -0
+
+config PRE_CON_BUF_SZ
+     int "Sets the size of the pre-console buffer"
+     depends on PRE_CONSOLE_BUFFER
+     default 4096
+     help
+       The size of the pre-console buffer affects how much console output
+       can be held before it overflows and starts discarding earlier
+       output. Normally there is very little output at this early stage,
+       unless debugging is enabled, so allow enough for ~10 lines of
+       text.
+
+       This is a useful feature if you are using a video console and
+       want to see the full boot output on the console. Without this
+       option only the post-relocation output will be displayed.
+
+config PRE_CON_BUF_ADDR
+     hex "Address of the pre-console buffer"
+     depends on PRE_CONSOLE_BUFFER
+     default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
+     default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
+     help
+       This sets the start address of the pre-console buffer. This must
+       be in available memory and is accessed before relocation and
+       possibly before DRAM is set up. Therefore choose an address
+       carefully.
+
+       We should consider removing this option and allocating the memory
Quoted 8 lines

common/Kconfig config SILENT_CONSOLE_UPDATE_ON_RELOC · line 289

Quoted 1 line
common/Kconfig +1 -0
+       in board_init_f_init_reserve() instead.

And what is the profit? The implementation becomes more complex, more fragile and defeats the whole purpose. We want to be able to print and accumulate debugging messages immediately, and not only after certain things are initialized relatively late in the boot process. That's exactly the reason why this pre-console buffer functionality exists in the first place.

We cannot print anything until we have global_data set up. This happens in board_init_f_init_reserve() so there is no point in having a console before then.

We should allocate all the init memory in one place, in C code.

This is very early in the boot process. Please take a look.

[...]

Regards,
Simon

#11 lore raw

PATCH v3 4/29 Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_IS_IN_ENV
CONFIG_CONSOLE_MUX

---

Changes in v3:
- Make SYS_CONSOLE_IS_IN_ENV default to y if CONSOLE_MUX is enabled

Changes in v2: None

 README                                              |  6 ------
 common/Kconfig                                      | 21 +++++++++++++++++++++
 configs/B4420QDS_NAND_defconfig                     |  1 +
 configs/B4420QDS_SPIFLASH_defconfig                 |  1 +
 configs/B4420QDS_defconfig                          |  1 +
 configs/B4860QDS_NAND_defconfig                     |  1 +
 configs/B4860QDS_SECURE_BOOT_defconfig              |  1 +
 configs/B4860QDS_SPIFLASH_defconfig                 |  1 +
 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig           |  1 +
 configs/B4860QDS_defconfig                          |  1 +
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig         |  1 +
 configs/BSC9131RDB_NAND_defconfig                   |  1 +
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig     |  1 +
 configs/BSC9131RDB_SPIFLASH_defconfig               |  1 +
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig  |  1 +
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig         |  1 +
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig  |  1 +
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig         |  1 +
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig   |  1 +
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig          |  1 +
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig   |  1 +
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig          |  1 +
 .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig    |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig       |  1 +
 .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig    |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig       |  1 +
 .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig  |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig     |  1 +
 .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig  |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig     |  1 +
 configs/C29XPCIE_NAND_defconfig                     |  1 +
 configs/C29XPCIE_NOR_SECBOOT_defconfig              |  1 +
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig         |  1 +
 configs/C29XPCIE_SPIFLASH_defconfig                 |  1 +
 configs/C29XPCIE_defconfig                          |  1 +
 configs/Cubietruck_plus_defconfig                   |  1 +
 configs/Cyrus_P5020_defconfig                       |  1 +
 configs/Cyrus_P5040_defconfig                       |  1 +
 configs/MIP405T_defconfig                           |  1 +
 configs/MIP405_defconfig                            |  1 +
 configs/Merrii_A80_Optimus_defconfig                |  1 +
 configs/MiniFAP_defconfig                           |  1 +
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig            |  1 +
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig     |  1 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig             |  1 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig          |  1 +
 .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig        |  1 +
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig          |  1 +
 configs/P1010RDB-PA_NAND_defconfig                  |  1 +
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig           |  1 +
 configs/P1010RDB-PA_NOR_defconfig                   |  1 +
 configs/P1010RDB-PA_SDCARD_defconfig                |  1 +
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig      |  1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig              |  1 +
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig            |  1 +
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig     |  1 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig             |  1 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig          |  1 +
 .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig        |  1 +
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig          |  1 +
 configs/P1010RDB-PB_NAND_defconfig                  |  1 +
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig           |  1 +
 configs/P1010RDB-PB_NOR_defconfig                   |  1 +
 configs/P1010RDB-PB_SDCARD_defconfig                |  1 +
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig      |  1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig              |  1 +
 configs/PATI_defconfig                              |  1 +
 configs/PIP405_defconfig                            |  1 +
 configs/PMC440_defconfig                            |  1 +
 configs/Sinovoip_BPI_M3_defconfig                   |  1 +
 configs/T1023RDB_NAND_defconfig                     |  1 +
 configs/T1023RDB_SDCARD_defconfig                   |  1 +
 configs/T1023RDB_SECURE_BOOT_defconfig              |  1 +
 configs/T1023RDB_SPIFLASH_defconfig                 |  1 +
 configs/T1023RDB_defconfig                          |  1 +
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig         |  1 +
 configs/T1024QDS_DDR4_defconfig                     |  1 +
 configs/T1024QDS_NAND_defconfig                     |  1 +
 configs/T1024QDS_SDCARD_defconfig                   |  1 +
 configs/T1024QDS_SECURE_BOOT_defconfig              |  1 +
 configs/T1024QDS_SPIFLASH_defconfig                 |  1 +
 configs/T1024QDS_defconfig                          |  1 +
 configs/T1024RDB_NAND_defconfig                     |  1 +
 configs/T1024RDB_SDCARD_defconfig                   |  1 +
 configs/T1024RDB_SECURE_BOOT_defconfig              |  1 +
 configs/T1024RDB_SPIFLASH_defconfig                 |  1 +
 configs/T1024RDB_defconfig                          |  1 +
 configs/T1040D4RDB_NAND_defconfig                   |  1 +
 configs/T1040D4RDB_SDCARD_defconfig                 |  1 +
 configs/T1040D4RDB_SECURE_BOOT_defconfig            |  1 +
 configs/T1040D4RDB_SPIFLASH_defconfig               |  1 +
 configs/T1040D4RDB_defconfig                        |  1 +
 configs/T1040QDS_DDR4_defconfig                     |  1 +
 configs/T1040QDS_SECURE_BOOT_defconfig              |  1 +
 configs/T1040QDS_defconfig                          |  1 +
 configs/T1040RDB_NAND_defconfig                     |  1 +
 configs/T1040RDB_SDCARD_defconfig                   |  1 +
 configs/T1040RDB_SECURE_BOOT_defconfig              |  1 +
 configs/T1040RDB_SPIFLASH_defconfig                 |  1 +
 configs/T1040RDB_defconfig                          |  1 +
 configs/T1042D4RDB_NAND_defconfig                   |  1 +
 configs/T1042D4RDB_SDCARD_defconfig                 |  1 +
 configs/T1042D4RDB_SECURE_BOOT_defconfig            |  1 +
 configs/T1042D4RDB_SPIFLASH_defconfig               |  1 +
 configs/T1042D4RDB_defconfig                        |  1 +
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig      |  1 +
 configs/T1042RDB_PI_NAND_defconfig                  |  1 +
 configs/T1042RDB_PI_SDCARD_defconfig                |  1 +
 configs/T1042RDB_PI_SPIFLASH_defconfig              |  1 +
 configs/T1042RDB_PI_defconfig                       |  1 +
 configs/T1042RDB_SECURE_BOOT_defconfig              |  1 +
 configs/T1042RDB_defconfig                          |  1 +
 configs/TQM5200_B_HIGHBOOT_defconfig                |  1 +
 configs/TQM5200_B_defconfig                         |  1 +
 configs/TQM5200_STK100_defconfig                    |  1 +
 configs/TQM5200_defconfig                           |  1 +
 configs/a3m071_defconfig                            |  1 +
 configs/a4m2k_defconfig                             |  1 +
 configs/apalis_t30_defconfig                        |  1 +
 configs/aristainetos2_defconfig                     |  1 +
 configs/aristainetos2b_defconfig                    |  1 +
 configs/aristainetos_defconfig                      |  1 +
 configs/arndale_defconfig                           |  1 +
 configs/at91sam9261ek_dataflash_cs0_defconfig       |  1 +
 configs/at91sam9261ek_dataflash_cs3_defconfig       |  1 +
 configs/at91sam9261ek_nandflash_defconfig           |  1 +
 configs/at91sam9263ek_dataflash_cs0_defconfig       |  1 +
 configs/at91sam9263ek_dataflash_defconfig           |  1 +
 configs/at91sam9263ek_nandflash_defconfig           |  1 +
 configs/at91sam9263ek_norflash_boot_defconfig       |  1 +
 configs/at91sam9263ek_norflash_defconfig            |  1 +
 configs/at91sam9g10ek_dataflash_cs0_defconfig       |  1 +
 configs/at91sam9g10ek_dataflash_cs3_defconfig       |  1 +
 configs/at91sam9g10ek_nandflash_defconfig           |  1 +
 configs/at91sam9m10g45ek_mmc_defconfig              |  1 +
 configs/at91sam9m10g45ek_nandflash_defconfig        |  1 +
 configs/at91sam9n12ek_mmc_defconfig                 |  1 +
 configs/at91sam9n12ek_nandflash_defconfig           |  1 +
 configs/at91sam9n12ek_spiflash_defconfig            |  1 +
 configs/at91sam9rlek_dataflash_defconfig            |  1 +
 configs/at91sam9rlek_mmc_defconfig                  |  1 +
 configs/at91sam9rlek_nandflash_defconfig            |  1 +
 configs/at91sam9x5ek_dataflash_defconfig            |  1 +
 configs/at91sam9x5ek_mmc_defconfig                  |  1 +
 configs/at91sam9x5ek_nandflash_defconfig            |  1 +
 configs/at91sam9x5ek_spiflash_defconfig             |  1 +
 configs/bayleybay_defconfig                         |  1 +
 configs/beaver_defconfig                            |  1 +
 configs/brppt1_mmc_defconfig                        |  1 +
 configs/brppt1_nand_defconfig                       |  1 +
 configs/brppt1_spi_defconfig                        |  1 +
 configs/brxre1_defconfig                            |  1 +
 configs/cardhu_defconfig                            |  1 +
 configs/cei-tk1-som_defconfig                       |  1 +
 configs/cgtqmx6eval_defconfig                       |  1 +
 configs/charon_defconfig                            |  1 +
 configs/chromebook_link_defconfig                   |  1 +
 configs/chromebox_panther_defconfig                 |  1 +
 configs/cm_fx6_defconfig                            |  1 +
 configs/cm_t3517_defconfig                          |  1 +
 configs/cm_t35_defconfig                            |  1 +
 configs/colibri_imx7_defconfig                      |  1 +
 configs/colibri_t30_defconfig                       |  1 +
 .../conga-qeval20-qa3-e3845-internal-uart_defconfig |  1 +
 configs/conga-qeval20-qa3-e3845_defconfig           |  1 +
 .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig   |  1 +
 configs/controlcenterd_36BIT_SDCARD_defconfig       |  1 +
 .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig    |  1 +
 configs/controlcenterd_TRAILBLAZER_defconfig        |  1 +
 configs/coreboot-x86_defconfig                      |  1 +
 configs/cougarcanyon2_defconfig                     |  1 +
 configs/crownbay_defconfig                          |  1 +
 configs/d2net_v2_defconfig                          |  1 +
 configs/dalmore_defconfig                           |  1 +
 configs/dfi-bt700-q7x-151_defconfig                 |  1 +
 configs/digsy_mtc_RAMBOOT_defconfig                 |  1 +
 configs/digsy_mtc_defconfig                         |  1 +
 configs/digsy_mtc_rev5_RAMBOOT_defconfig            |  1 +
 configs/digsy_mtc_rev5_defconfig                    |  1 +
 configs/dms-ba16-1g_defconfig                       |  1 +
 configs/dms-ba16_defconfig                          |  1 +
 configs/dns325_defconfig                            |  1 +
 configs/duovero_defconfig                           |  1 +
 configs/e2220-1170_defconfig                        |  1 +
 configs/ea20_defconfig                              |  1 +
 configs/efi-x86_defconfig                           |  1 +
 configs/espresso7420_defconfig                      |  1 +
 configs/evb-rk3288_defconfig                        |  1 +
 configs/fennec-rk3288_defconfig                     |  1 +
 configs/fo300_defconfig                             |  1 +
 configs/galileo_defconfig                           |  1 +
 configs/ge_b450v3_defconfig                         |  1 +
 configs/ge_b650v3_defconfig                         |  1 +
 configs/ge_b850v3_defconfig                         |  1 +
 configs/goflexhome_defconfig                        |  1 +
 configs/gwventana_defconfig                         |  1 +
 configs/h2200_defconfig                             |  1 +
 configs/h8_homlet_v2_defconfig                      |  1 +
 configs/haleakala_defconfig                         |  1 +
 configs/igep0020_defconfig                          |  1 +
 configs/igep0030_defconfig                          |  1 +
 configs/igep0030_nand_defconfig                     |  1 +
 configs/igep0032_defconfig                          |  1 +
 configs/imx31_phycore_eet_defconfig                 |  1 +
 configs/inetspace_v2_defconfig                      |  1 +
 configs/io64_defconfig                              |  1 +
 configs/ipek01_defconfig                            |  1 +
 configs/jetson-tk1_defconfig                        |  1 +
 configs/kc1_defconfig                               |  1 +
 configs/kilauea_defconfig                           |  1 +
 configs/ls1021aqds_ddr4_nor_defconfig               |  1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig        |  1 +
 configs/ls1021aqds_nand_defconfig                   |  1 +
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig        |  1 +
 configs/ls1021aqds_nor_defconfig                    |  1 +
 configs/ls1021aqds_nor_lpuart_defconfig             |  1 +
 configs/ls1021aqds_qspi_defconfig                   |  1 +
 configs/ls1021aqds_sdcard_ifc_defconfig             |  1 +
 configs/ls1021aqds_sdcard_qspi_defconfig            |  1 +
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig        |  1 +
 configs/ls1021atwr_nor_defconfig                    |  1 +
 configs/ls1021atwr_nor_lpuart_defconfig             |  1 +
 configs/ls1021atwr_qspi_defconfig                   |  1 +
 configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig |  1 +
 configs/ls1021atwr_sdcard_ifc_defconfig             |  1 +
 configs/ls1021atwr_sdcard_qspi_defconfig            |  1 +
 configs/lschlv2_defconfig                           |  1 +
 configs/lsxhl_defconfig                             |  1 +
 configs/lwmon5_defconfig                            |  1 +
 configs/m28evk_defconfig                            |  1 +
 configs/m53evk_defconfig                            |  1 +
 configs/makalu_defconfig                            |  1 +
 configs/marsboard_defconfig                         |  1 +
 configs/mcx_defconfig                               |  1 +
 configs/microblaze-generic_defconfig                |  1 +
 configs/miniarm-rk3288_defconfig                    |  1 +
 configs/minnowmax_defconfig                         |  1 +
 configs/mt_ventoux_defconfig                        |  1 +
 configs/mx23evk_defconfig                           |  1 +
 configs/mx28evk_auart_console_defconfig             |  1 +
 configs/mx28evk_defconfig                           |  1 +
 configs/mx28evk_nand_defconfig                      |  1 +
 configs/mx28evk_spi_defconfig                       |  1 +
 configs/mx51evk_defconfig                           |  1 +
 configs/mx53loco_defconfig                          |  1 +
 configs/mx6cuboxi_defconfig                         |  1 +
 configs/mx6dlsabreauto_defconfig                    |  1 +
 configs/mx6dlsabresd_defconfig                      |  1 +
 configs/mx6qpsabreauto_defconfig                    |  1 +
 configs/mx6qsabreauto_defconfig                     |  1 +
 configs/mx6qsabrelite_defconfig                     |  1 +
 configs/mx6qsabresd_defconfig                       |  1 +
 configs/mx6sabresd_spl_defconfig                    |  1 +
 configs/mx6sxsabresd_defconfig                      |  1 +
 configs/mx6sxsabresd_spl_defconfig                  |  1 +
 configs/mx6ul_14x14_evk_defconfig                   |  7 ++++---
 configs/mx6ul_9x9_evk_defconfig                     |  7 ++++---
 configs/mx7dsabresd_defconfig                       |  1 +
 configs/mx7dsabresd_secure_defconfig                |  1 +
 configs/nanopi_neo_defconfig                        |  1 +
 configs/net2big_v2_defconfig                        |  1 +
 configs/netspace_lite_v2_defconfig                  |  1 +
 configs/netspace_max_v2_defconfig                   |  1 +
 configs/netspace_mini_v2_defconfig                  |  1 +
 configs/netspace_v2_defconfig                       |  1 +
 configs/nitrogen6dl2g_defconfig                     |  1 +
 configs/nitrogen6dl_defconfig                       |  1 +
 configs/nitrogen6q2g_defconfig                      |  1 +
 configs/nitrogen6q_defconfig                        |  1 +
 configs/nitrogen6s1g_defconfig                      |  1 +
 configs/nitrogen6s_defconfig                        |  1 +
 configs/nokia_rx51_defconfig                        |  1 +
 configs/novena_defconfig                            |  1 +
 configs/odroid-xu3_defconfig                        |  1 +
 configs/odroid_defconfig                            |  1 +
 configs/omap3_pandora_defconfig                     |  1 +
 configs/omap3_zoom1_defconfig                       |  1 +
 configs/omap4_panda_defconfig                       |  1 +
 configs/omap4_sdp4430_defconfig                     |  1 +
 configs/orangepi_2_defconfig                        |  1 +
 configs/orangepi_lite_defconfig                     |  1 +
 configs/orangepi_one_defconfig                      |  1 +
 configs/orangepi_pc_defconfig                       |  1 +
 configs/orangepi_pc_plus_defconfig                  |  1 +
 configs/orangepi_plus2e_defconfig                   |  1 +
 configs/orangepi_plus_defconfig                     |  1 +
 configs/origen_defconfig                            |  1 +
 configs/p2371-0000_defconfig                        |  1 +
 configs/p2371-2180_defconfig                        |  1 +
 configs/p2571_defconfig                             |  1 +
 configs/p2771-0000-000_defconfig                    |  1 +
 configs/p2771-0000-500_defconfig                    |  1 +
 configs/picosam9g45_defconfig                       |  1 +
 configs/pine64_plus_defconfig                       |  1 +
 configs/plutux_defconfig                            |  1 +
 configs/pm9261_defconfig                            |  1 +
 configs/pm9263_defconfig                            |  1 +
 configs/popmetal-rk3288_defconfig                   |  1 +
 configs/qemu-x86_defconfig                          |  1 +
 configs/qemu-x86_efi_payload32_defconfig            |  1 +
 configs/qemu-x86_efi_payload64_defconfig            |  1 +
 configs/rainier_defconfig                           |  1 +
 configs/rainier_ramboot_defconfig                   |  1 +
 configs/riotboard_defconfig                         |  1 +
 configs/rpi_2_defconfig                             |  1 +
 configs/rpi_3_32b_defconfig                         |  1 +
 configs/rpi_3_defconfig                             |  1 +
 configs/rpi_defconfig                               |  1 +
 configs/s5p_goni_defconfig                          |  1 +
 configs/s5pc210_universal_defconfig                 |  1 +
 configs/sama5d3xek_mmc_defconfig                    |  1 +
 configs/sama5d3xek_nandflash_defconfig              |  1 +
 configs/sama5d3xek_spiflash_defconfig               |  1 +
 configs/sama5d4ek_mmc_defconfig                     |  1 +
 configs/sama5d4ek_nandflash_defconfig               |  1 +
 configs/sama5d4ek_spiflash_defconfig                |  1 +
 configs/sansa_fuze_plus_defconfig                   |  1 +
 configs/sequoia_defconfig                           |  1 +
 configs/sequoia_ramboot_defconfig                   |  1 +
 configs/smdk5250_defconfig                          |  1 +
 configs/smdk5420_defconfig                          |  1 +
 configs/sniper_defconfig                            |  1 +
 configs/socfpga_arria5_defconfig                    |  1 +
 configs/socfpga_cyclone5_defconfig                  |  1 +
 configs/socfpga_de0_nano_soc_defconfig              |  1 +
 configs/socfpga_is1_defconfig                       |  1 +
 configs/socfpga_mcvevk_defconfig                    |  1 +
 configs/socfpga_sockit_defconfig                    |  1 +
 configs/socfpga_socrates_defconfig                  |  1 +
 configs/socfpga_sr1500_defconfig                    |  1 +
 configs/socfpga_vining_fpga_defconfig               |  1 +
 configs/socrates_defconfig                          |  1 +
 configs/som-db5800-som-6867_defconfig               |  1 +
 configs/tbs2910_defconfig                           |  3 ++-
 configs/tec-ng_defconfig                            |  1 +
 configs/theadorable-x86-dfi-bt700_defconfig         |  1 +
 configs/trats2_defconfig                            |  1 +
 configs/trats_defconfig                             |  1 +
 configs/trimslice_defconfig                         |  1 +
 configs/venice2_defconfig                           |  1 +
 configs/wandboard_defconfig                         |  1 +
 configs/whistler_defconfig                          |  1 +
 configs/xfi3_defconfig                              |  1 +
 include/configs/B4860QDS.h                          |  3 ---
 include/configs/BSC9131RDB.h                        |  2 --
 include/configs/BSC9132QDS.h                        |  2 --
 include/configs/C29XPCIE.h                          |  2 --
 include/configs/MIP405.h                            |  1 -
 include/configs/P1010RDB.h                          |  2 --
 include/configs/PATI.h                              |  1 -
 include/configs/PIP405.h                            |  1 -
 include/configs/PMC440.h                            |  2 --
 include/configs/T102xQDS.h                          |  1 -
 include/configs/T102xRDB.h                          |  1 -
 include/configs/T1040QDS.h                          |  1 -
 include/configs/T104xRDB.h                          |  3 ---
 include/configs/TQM5200.h                           |  1 -
 include/configs/a3m071.h                            |  1 -
 include/configs/advantech_dms-ba16.h                |  1 -
 include/configs/am3517_crane.h                      |  1 -
 include/configs/aristainetos-common.h               |  1 -
 include/configs/at91sam9261ek.h                     |  2 --
 include/configs/at91sam9263ek.h                     |  1 -
 include/configs/at91sam9m10g45ek.h                  |  1 -
 include/configs/at91sam9n12ek.h                     |  1 -
 include/configs/at91sam9rlek.h                      |  1 -
 include/configs/at91sam9x5ek.h                      |  1 -
 include/configs/bur_cfg_common.h                    |  1 -
 include/configs/cgtqmx6eval.h                       |  1 -
 include/configs/cm_fx6.h                            |  2 --
 include/configs/cm_t35.h                            |  1 -
 include/configs/cm_t3517.h                          |  1 -
 include/configs/colibri_imx7.h                      |  1 -
 include/configs/controlcenterd.h                    |  2 --
 include/configs/cyrus.h                             |  2 --
 include/configs/digsy_mtc.h                         |  1 -
 include/configs/dns325.h                            |  2 --
 include/configs/ea20.h                              |  1 -
 include/configs/embestmx6boards.h                   |  1 -
 include/configs/exynos5-common.h                    |  2 --
 include/configs/exynos7420-common.h                 |  2 --
 include/configs/ge_bx50v3.h                         |  1 -
 include/configs/goflexhome.h                        |  2 --
 include/configs/gw_ventana.h                        |  2 --
 include/configs/h2200.h                             |  1 -
 include/configs/imx31_phycore.h                     |  1 -
 include/configs/io64.h                              |  2 --
 include/configs/ipek01.h                            |  1 -
 include/configs/kc1.h                               |  2 --
 include/configs/kilauea.h                           |  2 --
 include/configs/lacie_kw.h                          |  2 --
 include/configs/ls1021aqds.h                        |  1 -
 include/configs/ls1021atwr.h                        |  1 -
 include/configs/lsxl.h                              |  1 -
 include/configs/lwmon5.h                            |  1 -
 include/configs/m53evk.h                            |  1 -
 include/configs/ma5d4evk.h                          |  1 -
 include/configs/makalu.h                            |  2 --
 include/configs/mcx.h                               |  1 -
 include/configs/microblaze-generic.h                |  2 --
 include/configs/mt_ventoux.h                        |  1 -
 include/configs/mx51evk.h                           |  1 -
 include/configs/mx53loco.h                          |  1 -
 include/configs/mx6cuboxi.h                         |  2 --
 include/configs/mx6sabre_common.h                   |  1 -
 include/configs/mx6sxsabresd.h                      |  1 -
 include/configs/mx6ul_14x14_evk.h                   |  1 -
 include/configs/mx7dsabresd.h                       |  1 -
 include/configs/mxs.h                               |  1 -
 include/configs/nitrogen6x.h                        |  2 --
 include/configs/nokia_rx51.h                        |  1 -
 include/configs/novena.h                            |  2 --
 include/configs/odroid.h                            |  1 -
 include/configs/omap3_evm.h                         |  1 -
 include/configs/omap3_igep00x0.h                    |  1 -
 include/configs/omap3_pandora.h                     |  1 -
 include/configs/omap3_zoom1.h                       |  1 -
 include/configs/origen.h                            |  1 -
 include/configs/picosam9g45.h                       |  1 -
 include/configs/pm9261.h                            |  1 -
 include/configs/pm9263.h                            |  1 -
 include/configs/rk3288_common.h                     |  5 -----
 include/configs/rpi.h                               |  2 --
 include/configs/s5p_goni.h                          |  1 -
 include/configs/s5pc210_universal.h                 |  1 -
 include/configs/sama5d2_xplained.h                  |  1 -
 include/configs/sama5d3xek.h                        |  1 -
 include/configs/sama5d4_xplained.h                  |  1 -
 include/configs/sama5d4ek.h                         |  1 -
 include/configs/sandbox.h                           |  2 --
 include/configs/sequoia.h                           |  2 --
 include/configs/snapper9g45.h                       |  2 --
 include/configs/sniper.h                            |  2 --
 include/configs/socfpga_common.h                    |  1 -
 include/configs/socrates.h                          |  1 -
 include/configs/sunxi-common.h                      |  3 ---
 include/configs/tbs2910.h                           |  2 --
 include/configs/tegra-common.h                      |  2 --
 include/configs/ti_omap4_common.h                   |  1 -
 include/configs/trats.h                             |  1 -
 include/configs/trats2.h                            |  1 -
 include/configs/wandboard.h                         |  1 -
 include/configs/x86-common.h                        |  2 --
 scripts/config_whitelist.txt                        |  2 --
 448 files changed, 373 insertions(+), 156 deletions(-)
README +0 -6
index 8f93dad..638f1e3 100644
@@ -3679,12 +3679,6 @@ Configuration Settings:
 - CONFIG_SYS_CONSOLE_INFO_QUIET
 		Suppress display of console information at boot.
 
-- CONFIG_SYS_CONSOLE_IS_IN_ENV
-		If the board specific function
-			extern int overwrite_console (void);
-		returns 1, the stdin, stderr and stdout are switched to the
-		serial port, else the settings in the environment are used.
-
 - CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 		Enable the call to overwrite_console().
 
common/Kconfig +21 -0
index 6ee67ac..0a417c9 100644
@@ -288,6 +288,27 @@ config PRE_CON_BUF_ADDR
 	  We should consider removing this option and allocating the memory
 	  in board_init_f_init_reserve() instead.
 
+config CONSOLE_MUX
+	bool "Enable console multiplexing"
+	default y if DM_VIDEO || VIDEO || LCD
+	help
+	  This allows multiple devices to be used for each console 'file'.
+	  For example, stdout can be set to go to serial and video.
+	  Similarly, stdin can be set to come from serial and keyboard.
+	  Input can be provided from either source. Console multiplexing
+	  adds a small amount of size to U-Boot.  Changes to the environment
+	  variables stdout, stdin and stderr will take effect immediately.
+
+config SYS_CONSOLE_IS_IN_ENV
+	bool "Select console devices from the environment"
+        default y if CONSOLE_MUX
+	help
+	  This allows multiple input/output devices to be set at boot time.
+	  For example, if stdout is set to "serial,video" then output will
+	  be sent to both the serial and video devices on boot. The
+	  environment variables can be updated after boot to change the
+	  input/output devices.
+
 endmenu
 
 config SYS_NO_FLASH
configs/B4420QDS_NAND_defconfig +1 -0
index c192177..d3cf286 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/B4420QDS_SPIFLASH_defconfig +1 -0
index 2c2e3c2..2dd25fe 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_SF=y
configs/B4420QDS_defconfig +1 -0
index bfd64af..406241a 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_SF=y
configs/B4860QDS_NAND_defconfig +1 -0
index d01baaa..00fe182 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/B4860QDS_SECURE_BOOT_defconfig +1 -0
index 75124a8..2923547 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_SF=y
configs/B4860QDS_SPIFLASH_defconfig +1 -0
index 52f78be..80e729e 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_SF=y
configs/B4860QDS_SRIO_PCIE_BOOT_defconfig +1 -0
index cd80c91..09c8a5b 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_GREPENV=y
configs/B4860QDS_defconfig +1 -0
index 1f642e3..31f64ab 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_SF=y
configs/BSC9131RDB_NAND_SYSCLK100_defconfig +1 -0
index babcdd5..e2a8103 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND,SYS_CLK_100"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
configs/BSC9131RDB_NAND_defconfig +1 -0
index ad00622..c9cfaf8 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig +1 -0
index 9045567..9694709 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH,SYS_CLK_100"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/BSC9131RDB_SPIFLASH_defconfig +1 -0
index 178618c..367ba78 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig +1 -0
index e678144..3615b6c 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_100,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_NAND_DDRCLK100_defconfig +1 -0
index e6fde47..e3a76b3 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_100"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig +1 -0
index 1d9b541..c204783 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_133,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_NAND_DDRCLK133_defconfig +1 -0
index 235f304..de42f7b 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_133"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig +1 -0
index f193c4b..dc9e3f8 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_NOR_DDRCLK100_defconfig +1 -0
index 4c9c955..748a247 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig +1 -0
index 74c3385..bd1da16 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_NOR_DDRCLK133_defconfig +1 -0
index 4bc83ef..dd13d06 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig +1 -0
index 0bea345..8723279 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig +1 -0
index f16b1b1..6e56dae 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig +1 -0
index d24f216..ac9a16c 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig +1 -0
index a9555db..ca2853e 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig +1 -0
index 06a1770..afb14d2 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig +1 -0
index c86ce6f..47a037b 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig +1 -0
index 6f6f2dc..2087b46 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig +1 -0
index da71c54..d87aa5c 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/C29XPCIE_NAND_defconfig +1 -0
index 1c03d44..c3cc168 100644
@@ -10,6 +10,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,NAND"
 CONFIG_BOOTDELAY=-1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_TPL_ENV_SUPPORT=y
configs/C29XPCIE_NOR_SECBOOT_defconfig +1 -0
index f932373..15d89f1 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,SECURE_BOOT"
 CONFIG_BOOTDELAY=-1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig +1 -0
index 7f4189e..49799be 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,SPIFLASH,SECURE_BOOT"
 CONFIG_BOOTDELAY=-1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
configs/C29XPCIE_SPIFLASH_defconfig +1 -0
index ff16c7a..9f89263 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,SPIFLASH"
 CONFIG_BOOTDELAY=-1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
configs/C29XPCIE_defconfig +1 -0
index 8dd57d2..83493d4 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE"
 CONFIG_BOOTDELAY=-1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
configs/Cubietruck_plus_defconfig +1 -0
index f2c6fe7..dbe3336 100644
@@ -13,6 +13,7 @@ CONFIG_I2C0_ENABLE=y
 CONFIG_AXP_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-cubietruck-plus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/Cyrus_P5020_defconfig +1 -0
index d8c8957..6495440 100644
@@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF40000,PPC_P5020"
 CONFIG_BOOTDELAY=10
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_GREPENV=y
configs/Cyrus_P5040_defconfig +1 -0
index f5d3cc2..4566abb 100644
@@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF40000,PPC_P5040"
 CONFIG_BOOTDELAY=10
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_GREPENV=y
configs/MIP405T_defconfig +1 -0
index e5910cd..0f4f12f 100644
@@ -3,6 +3,7 @@ CONFIG_IDENT_STRING="\n(c) 2003 by MPL AG Switzerland, MEV-10082-001 released"
 CONFIG_4xx=y
 CONFIG_TARGET_MIP405T=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
configs/MIP405_defconfig +1 -0
index a38eac1..b749a41 100644
@@ -3,6 +3,7 @@ CONFIG_IDENT_STRING="\n(c) 2003 by MPL AG Switzerland, MEV-10072-001 released"
 CONFIG_4xx=y
 CONFIG_TARGET_MIP405=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
configs/Merrii_A80_Optimus_defconfig +1 -0
index 198fda9..774d137 100644
@@ -7,6 +7,7 @@ CONFIG_SYS_CLK_FREQ=1008000000
 CONFIG_MMC0_CD_PIN="PH18"
 CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
configs/MiniFAP_defconfig +1 -0
index 266f2ce..aec6b9a 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="MINIFAP"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig +1 -0
index 864643c..986dc7f 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND_SECBOOT,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PA_36BIT_NAND_defconfig +1 -0
index fc14f50..7155011 100644
@@ -11,6 +11,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_TPL_ENV_SUPPORT=y
configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig +1 -0
index 17dd94b..f687a84 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PA_36BIT_NOR_defconfig +1 -0
index 6de688f..cf42d2f 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PA_36BIT_SDCARD_defconfig +1 -0
index 4006383..f3f0fca 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig +1 -0
index 6ff1f50..94a1c22 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +1 -0
index 94f1501..c56d9e3 100644
@@ -16,6 +16,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/P1010RDB-PA_NAND_SECBOOT_defconfig +1 -0
index 911f607..df0cc7a 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND_SECBOOT,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PA_NAND_defconfig +1 -0
index db003ef..f6943a8 100644
@@ -10,6 +10,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_TPL_ENV_SUPPORT=y
configs/P1010RDB-PA_NOR_SECBOOT_defconfig +1 -0
index 9599528..50166ce 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PA_NOR_defconfig +1 -0
index e25da5c..6a6bcaf 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PA_SDCARD_defconfig +1 -0
index d8d069e..64959d7 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig +1 -0
index 7050462..a4073f6 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PA_SPIFLASH_defconfig +1 -0
index b8229fa..eea19e6 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig +1 -0
index 55da2e4..3ac3839 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PB_36BIT_NAND_defconfig +1 -0
index dd170a5..406a58a 100644
@@ -11,6 +11,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_TPL_ENV_SUPPORT=y
configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig +1 -0
index 166df05..a1375b3 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PB_36BIT_NOR_defconfig +1 -0
index e751041..c95c28c 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PB_36BIT_SDCARD_defconfig +1 -0
index b907459..38fbb18 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig +1 -0
index f26fa72..f201f13 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +1 -0
index e87c9d6..87e23dd 100644
@@ -16,6 +16,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/P1010RDB-PB_NAND_SECBOOT_defconfig +1 -0
index 7fad176..ececb7e 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PB_NAND_defconfig +1 -0
index 11f0866..f45db61 100644
@@ -10,6 +10,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_TPL_ENV_SUPPORT=y
configs/P1010RDB-PB_NOR_SECBOOT_defconfig +1 -0
index 6282ccb..ecafb24 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PB_NOR_defconfig +1 -0
index d477a88..231c806 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PB_SDCARD_defconfig +1 -0
index 613131a..14f67b0 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig +1 -0
index c2238d6..524afd9 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
configs/P1010RDB-PB_SPIFLASH_defconfig +1 -0
index fb7334b..591075f 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/PATI_defconfig +1 -0
index 80f077a..45be3bb 100644
@@ -3,6 +3,7 @@ CONFIG_IDENT_STRING="\n(c) 2003 by MPL AG Switzerland, MEV-10084-001 released"
 CONFIG_5xx=y
 CONFIG_TARGET_PATI=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="pati=> "
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_IMLS is not set
configs/PIP405_defconfig +1 -0
index 87f2f31..02c9c1b 100644
@@ -3,6 +3,7 @@ CONFIG_IDENT_STRING="\n(c) 2002 by MPL AG Switzerland, MEV-10066-001 released"
 CONFIG_4xx=y
 CONFIG_TARGET_PIP405=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
configs/PMC440_defconfig +1 -0
index af38882..cd2f0d2 100644
@@ -3,6 +3,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_PMC440=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
configs/Sinovoip_BPI_M3_defconfig +1 -0
index a9c7fc1..d15ac20 100644
@@ -14,6 +14,7 @@ CONFIG_AXP_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-sinovoip-bpi-m3"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPD(25)"
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/T1023RDB_NAND_defconfig +1 -0
index b24d21b..fed2560 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1023RDB_SDCARD_defconfig +1 -0
index 7f84498..c45de13 100644
@@ -14,6 +14,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1023RDB_SECURE_BOOT_defconfig +1 -0
index fa538f3..3e5765e 100644
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/T1023RDB_SPIFLASH_defconfig +1 -0
index c75abbb..9ec82d5 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1023RDB_defconfig +1 -0
index af99ff0..c0fe36b 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +1 -0
index 395330d..93637e4 100644
@@ -9,6 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1024QDS_DDR4_defconfig +1 -0
index fd1f2f0..ac419b4 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1024QDS_NAND_defconfig +1 -0
index a62560a..6ed4e9e 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024QDS_SDCARD_defconfig +1 -0
index 5a2f3f9..243b2b1 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024QDS_SECURE_BOOT_defconfig +1 -0
index 04787a0..e3a249f 100644
@@ -9,6 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1024QDS_SPIFLASH_defconfig +1 -0
index 1a96a63..8a8b854 100644
@@ -16,6 +16,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024QDS_defconfig +1 -0
index 6f6fc86..b5c6c1e 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1024RDB_NAND_defconfig +1 -0
index 737c648..dfc9697 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024RDB_SDCARD_defconfig +1 -0
index 444d7f8..15545d8 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024RDB_SECURE_BOOT_defconfig +1 -0
index 2eada3f..43ba56b 100644
@@ -9,6 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
index 2c0f761..99d2a40 100644
@@ -16,6 +16,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1024RDB_defconfig +1 -0
index aa24d57..72fc86f 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/T1040D4RDB_NAND_defconfig +1 -0
index b1d1159..c420dc3 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040D4RDB_SDCARD_defconfig +1 -0
index 5a3a00f..ff4bbe3 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040D4RDB_SECURE_BOOT_defconfig +1 -0
index e437f3e..f548e21 100644
@@ -9,6 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040D4RDB_SPIFLASH_defconfig +1 -0
index 55671a6..00feb36 100644
@@ -16,6 +16,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040D4RDB_defconfig +1 -0
index f68d6f2..55adc62 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040QDS_DDR4_defconfig +1 -0
index bda4fb3..8526426 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040QDS_SECURE_BOOT_defconfig +1 -0
index 4ec922a..6dee606 100644
@@ -9,6 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040QDS_defconfig +1 -0
index 6de7d31..716490b 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040RDB_NAND_defconfig +1 -0
index e144a88..da6ef10 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040RDB_SDCARD_defconfig +1 -0
index aa3f0f8..49b6221 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040RDB_SECURE_BOOT_defconfig +1 -0
index 00e5b12..98e7855 100644
@@ -9,6 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT,T1040RDB"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1040RDB_SPIFLASH_defconfig +1 -0
index 466bdd7..31ea589 100644
@@ -16,6 +16,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1040RDB_defconfig +1 -0
index 422a738..b898f93 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042D4RDB_NAND_defconfig +1 -0
index d631eca..ce34ec1 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042D4RDB_SDCARD_defconfig +1 -0
index aeea55f..63e88df 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042D4RDB_SECURE_BOOT_defconfig +1 -0
index d6ceeba..9035ab9 100644
@@ -9,6 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index 66a2c44..b26304c 100644
@@ -16,6 +16,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042D4RDB_defconfig +1 -0
index 71dabd9..ff39f15 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +1 -0
index 6d01cf2..3e4e9e2 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND,SECURE_BOOT"
 CONFIG_BOOTDELAY=0
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_CRYPTO_SUPPORT=y
 CONFIG_SPL_HASH_SUPPORT=y
configs/T1042RDB_PI_NAND_defconfig +1 -0
index 0377d25..5fd9c1e 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042RDB_PI_SDCARD_defconfig +1 -0
index 1894c62..95a4c8a 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042RDB_PI_SPIFLASH_defconfig +1 -0
index 1cb34a5..f05e33c 100644
@@ -16,6 +16,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/T1042RDB_PI_defconfig +1 -0
index ef8332b..07faad5 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042RDB_SECURE_BOOT_defconfig +1 -0
index 224d1d8..e9d4145 100644
@@ -9,6 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,SECURE_BOOT,T1042RDB"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/T1042RDB_defconfig +1 -0
index ee35e43..8e11872 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
configs/TQM5200_B_HIGHBOOT_defconfig +1 -0
index be90d79..353fdc1 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,SYS_TEXT_BASE=0xFFF00000"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
configs/TQM5200_B_defconfig +1 -0
index a405e92..ec3655d 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
configs/TQM5200_STK100_defconfig +1 -0
index 904fcd1..823e2ae 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="STK52XX_REV100"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
configs/TQM5200_defconfig +1 -0
index e478f4c..c47ff76 100644
@@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
configs/a3m071_defconfig +1 -0
index 9e573a7..c486bbc 100644
@@ -8,6 +8,7 @@ CONFIG_TARGET_A3M071=y
 CONFIG_FIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/a4m2k_defconfig +1 -0
index aa09bf5..ff67718 100644
@@ -9,6 +9,7 @@ CONFIG_FIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="A4M2K"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/apalis_t30_defconfig +1 -0
index a22e6b6..531f207 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_APALIS_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Apalis T30 # "
 CONFIG_CMD_BOOTZ=y
configs/aristainetos2_defconfig +1 -0
index 35d7e94..2f1e4da 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_ARISTAINETOS2=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/aristainetos2b_defconfig +1 -0
index 6b2c44d..708bc24 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_ARISTAINETOS2B=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/aristainetos_defconfig +1 -0
index a06d9ee..de00afd 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_ARISTAINETOS=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/arndale_defconfig +1 -0
index f78a88c..5dd6fda 100644
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
 CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ARNDALE # "
configs/at91sam9261ek_dataflash_cs0_defconfig +1 -0
index 51b3ec1..99bb49e 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
configs/at91sam9261ek_dataflash_cs3_defconfig +1 -0
index f5ffbcd..014e50e 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
configs/at91sam9261ek_nandflash_defconfig +1 -0
index c985d3a..e0e8fea 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
configs/at91sam9263ek_dataflash_cs0_defconfig +1 -0
index 09a1404..38b9635 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
configs/at91sam9263ek_dataflash_defconfig +1 -0
index 09a1404..38b9635 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
configs/at91sam9263ek_nandflash_defconfig +1 -0
index 3a18c3b..317d9c2 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
configs/at91sam9263ek_norflash_boot_defconfig +1 -0
index e4608d2..a26d7d1 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
configs/at91sam9263ek_norflash_defconfig +1 -0
index 4c97c9f..8b72678 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
configs/at91sam9g10ek_dataflash_cs0_defconfig +1 -0
index 1ee26d9..0293aa6 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
configs/at91sam9g10ek_dataflash_cs3_defconfig +1 -0
index de6cacd..777d234 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
configs/at91sam9g10ek_nandflash_defconfig +1 -0
index 257593d..788e7e1 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
configs/at91sam9m10g45ek_mmc_defconfig +1 -0
index 0aaa888..9604af9 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9m10g45ek_nandflash_defconfig +1 -0
index 05140ac..e1aebb1 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9n12ek_mmc_defconfig +1 -0
index 3eb8666..ce62edf 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_BOOTZ=y
configs/at91sam9n12ek_nandflash_defconfig +1 -0
index 15e1970..3b7ebc2 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9n12ek_spiflash_defconfig +1 -0
index ebed1db..26c93af 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9rlek_dataflash_defconfig +1 -0
index 69be1d2..494a630 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
configs/at91sam9rlek_mmc_defconfig +1 -0
index c49bf18..f0ea3f0 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
configs/at91sam9rlek_nandflash_defconfig +1 -0
index 142122e..0a414e4 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
configs/at91sam9x5ek_dataflash_defconfig +1 -0
index beeb8cc..bb47f4a 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_BOOTZ=y
configs/at91sam9x5ek_mmc_defconfig +1 -0
index eb88bbb..a7d2c9d 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_BOOTZ=y
configs/at91sam9x5ek_nandflash_defconfig +1 -0
index 4b28d74..b482687 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9x5ek_spiflash_defconfig +1 -0
index 4a1ea42..5446215 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
configs/bayleybay_defconfig +1 -0
index 64e3d31..fd4d9fb 100644
@@ -15,6 +15,7 @@ CONFIG_SEABIOS=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/beaver_defconfig +1 -0
index 503b8d1..16166fe 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_BEAVER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra30 (Beaver) # "
 CONFIG_CMD_BOOTZ=y
configs/brppt1_mmc_defconfig +1 -0
index 15365b9..e990f03 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
 CONFIG_BOOTDELAY=-2
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/brppt1_nand_defconfig +1 -0
index 05fc1e0..8872f4a 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_BOOTDELAY=-2
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/brppt1_spi_defconfig +1 -0
index 4855acc..c04dde8 100644
@@ -15,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
 CONFIG_SPI_BOOT=y
 CONFIG_BOOTDELAY=-2
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/brxre1_defconfig +1 -0
index 8fe1100..0251088 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_BOOTDELAY=-2
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/cardhu_defconfig +1 -0
index 2d361c3..afc671b 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_CARDHU=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # "
 CONFIG_CMD_BOOTZ=y
configs/cei-tk1-som_defconfig +1 -0
index fb7e2af..e5162a5 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_CEI_TK1_SOM=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-cei-tk1-som"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra124 (TK1-SOM) # "
 CONFIG_CMD_BOOTZ=y
configs/cgtqmx6eval_defconfig +1 -0
index 5a053f5..f1ee51d 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
configs/charon_defconfig +1 -0
index 724441e..8517f2b 100644
@@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y
 CONFIG_TARGET_CHARON=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
configs/chromebook_link_defconfig +1 -0
index 8c91bfe..9d8f6fb 100644
@@ -10,6 +10,7 @@ CONFIG_HAVE_VGA_BIOS=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/chromebox_panther_defconfig +1 -0
index 2557d35..cc68c6a 100644
@@ -8,6 +8,7 @@ CONFIG_HAVE_VGA_BIOS=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/cm_fx6_defconfig +1 -0
index 998bc05..12b75ae 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="CM-FX6 # "
configs/cm_t3517_defconfig +1 -0
index dfc2539..b131b27 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_CM_T3517=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="CM-T3517 # "
 CONFIG_CMD_BOOTZ=y
configs/cm_t35_defconfig +1 -0
index 79fa39c..9a2f624 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_TARGET_CM_T35=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="CM-T3x # "
configs/colibri_imx7_defconfig +1 -0
index 7c4d349..1f7525b 100644
@@ -5,6 +5,7 @@ CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Colibri iMX7 # "
 # CONFIG_CMD_BOOTD is not set
configs/colibri_t30_defconfig +1 -0
index e9eabed..794d9be 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_COLIBRI_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Colibri T30 # "
 CONFIG_CMD_BOOTZ=y
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +1 -0
index f0da176..d8a7d42 100644
@@ -15,6 +15,7 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/conga-qeval20-qa3-e3845_defconfig +1 -0
index 63c2cbd..1bd53fc 100644
@@ -14,6 +14,7 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +1 -0
index 88d189a..cdd466a 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD,DEVELOP"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/controlcenterd_36BIT_SDCARD_defconfig +1 -0
index c8679e2..28951e0 100644
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +1 -0
index e94d72f..56179af 100644
@@ -4,6 +4,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP"
 CONFIG_BOOTDELAY=-2
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/controlcenterd_TRAILBLAZER_defconfig +1 -0
index 257fa85..c40a205 100644
@@ -4,6 +4,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH"
 CONFIG_BOOTDELAY=-2
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/coreboot-x86_defconfig +1 -0
index 378d75f..c2294c5 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_COREBOOT=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/cougarcanyon2_defconfig +1 -0
index a55e4a3..cfd868d 100644
@@ -2,6 +2,7 @@ CONFIG_X86=y
 CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="cougarcanyon2"
 CONFIG_TARGET_COUGARCANYON2=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/crownbay_defconfig +1 -0
index d0cd9db..838d86c 100644
@@ -8,6 +8,7 @@ CONFIG_HAVE_VGA_BIOS=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_FIT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/d2net_v2_defconfig +1 -0
index 3b94de4..40b6637 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_NET2BIG_V2=y
 CONFIG_IDENT_STRING=" D2 v2"
 CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="d2v2> "
 # CONFIG_CMD_IMLS is not set
configs/dalmore_defconfig +1 -0
index 2855af5..70dfc35 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA114=y
 CONFIG_TARGET_DALMORE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # "
 CONFIG_CMD_BOOTZ=y
configs/dfi-bt700-q7x-151_defconfig +1 -0
index 245d0c7..0cf60eb 100644
@@ -14,6 +14,7 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/digsy_mtc_RAMBOOT_defconfig +1 -0
index d0743c8..2494412 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
configs/digsy_mtc_defconfig +1 -0
index e2156a1..1f4c15c 100644
@@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n"
configs/digsy_mtc_rev5_RAMBOOT_defconfig +1 -0
index 3b7a7c1..8d77864 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000,DIGSY_REV5"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
configs/digsy_mtc_rev5_defconfig +1 -0
index 75888ff..56e14e1 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="DIGSY_REV5"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
configs/dms-ba16-1g_defconfig +1 -0
index db5adcf..5042a82 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ADVANTECH_DMS_BA16=y
 CONFIG_SYS_DDR_1G=y
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/dms-ba16_defconfig +1 -0
index e36f3dc..da741b4 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ADVANTECH_DMS_BA16=y
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/dns325_defconfig +1 -0
index a26629d..59b8b7b 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DNS325=y
 CONFIG_IDENT_STRING="\nD-Link DNS-325"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/duovero_defconfig +1 -0
index 64f9cbc..351e133 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP44XX=y
 # CONFIG_SPL_I2C_SUPPORT is not set
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_TARGET_DUOVERO=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/e2220-1170_defconfig +1 -0
index 7d0cb68..fad5526 100644
@@ -3,6 +3,7 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA210=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra210 (E2220-1170) # "
 # CONFIG_CMD_IMI is not set
configs/ea20_defconfig +1 -0
index 0e28878..2b17a51 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_EA20=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ea20 > "
configs/efi-x86_defconfig +1 -0
index eb55e93..c47f314 100644
@@ -3,6 +3,7 @@ CONFIG_VENDOR_EFI=y
 CONFIG_DEFAULT_DEVICE_TREE="efi"
 CONFIG_TARGET_EFI=y
 CONFIG_FIT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_IMLS is not set
configs/espresso7420_defconfig +1 -0
index e782710..cadbc65 100644
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_IDENT_STRING=" for ESPRESSO7420"
 CONFIG_DEFAULT_DEVICE_TREE="exynos7420-espresso7420"
 CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_PROMPT="ESPRESSO7420 # "
 # CONFIG_AUTOBOOT is not set
 # CONFIG_CMD_IMLS is not set
configs/evb-rk3288_defconfig +1 -0
index 7ae03a6..b1b599a 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_EVB_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-evb"
 CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/fennec-rk3288_defconfig +1 -0
index 5d25ee4..2693f5d 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_FENNEC_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-fennec"
 CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/fo300_defconfig +1 -0
index 697a147..eda7a14 100644
@@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="FO300"
 CONFIG_BOOTDELAY=5
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
configs/galileo_defconfig +1 -0
index f79ee2e..ef6ce97 100644
@@ -9,6 +9,7 @@ CONFIG_GENERATE_ACPI_TABLE=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/ge_b450v3_defconfig +1 -0
index 8577167..29010f3 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 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_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/ge_b650v3_defconfig +1 -0
index c5f391e..e0eeb46 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 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_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/ge_b850v3_defconfig +1 -0
index 2c5aa05..9b4b917 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 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_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/goflexhome_defconfig +1 -0
index 22e8452..8fd3302 100644
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GOFLEXHOME=y
 CONFIG_IDENT_STRING="\nSeagate GoFlex Home"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_PROMPT="GoFlexHome> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/gwventana_defconfig +1 -0
index 0f726ae..6240290 100644
@@ -16,6 +16,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_DMA_SUPPORT=y
configs/h2200_defconfig +1 -0
index 22f0759..3b031e0 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_H2200=y
 CONFIG_FIT=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="> "
 # CONFIG_CMD_BDI is not set
configs/h8_homlet_v2_defconfig +1 -0
index c4bd2c5..76dd833 100644
@@ -9,6 +9,7 @@ CONFIG_USB1_VBUS_PIN="PL6"
 CONFIG_AXP_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-allwinner-h8homlet-v2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/haleakala_defconfig +1 -0
index 270d2a3..5861769 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_KILAUEA=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="HALEAKALA"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
configs/igep0020_defconfig +1 -0
index 0ec4ebc..4b1e95b 100644
@@ -4,6 +4,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y
configs/igep0030_defconfig +1 -0
index bc0ec6a..798ef02 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND"
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y
configs/igep0030_nand_defconfig +1 -0
index 0750881..4833e62 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND"
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y
configs/igep0032_defconfig +1 -0
index 280afbd..eb65801 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND"
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y
configs/imx31_phycore_eet_defconfig +1 -0
index 96252c3..a210abb 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_IMX31_PHYCORE=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX31_PHYCORE_EET"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
configs/inetspace_v2_defconfig +1 -0
index 3a5bf5e..3a81fd6 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" IS v2"
 CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 # CONFIG_CMD_IMLS is not set
configs/io64_defconfig +1 -0
index 6215c77..87ef11e 100644
@@ -6,6 +6,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_AUTOBOOT_KEYED=y
configs/ipek01_defconfig +1 -0
index 54b873f..0042d3f 100644
@@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y
 CONFIG_TARGET_IPEK01=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_LOOPW=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
configs/jetson-tk1_defconfig +1 -0
index af913ac..36b08b5 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_JETSON_TK1=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # "
 CONFIG_CMD_BOOTZ=y
configs/kc1_defconfig +1 -0
index 4827934..b73a2de 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP44XX=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_TARGET_KC1=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="kc1 # "
configs/kilauea_defconfig +1 -0
index f740b0b..a497408 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_KILAUEA=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="KILAUEA"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
configs/ls1021aqds_ddr4_nor_defconfig +1 -0
index 2df48c2..746eba6 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0
index 7951f65..74d5f86 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART"
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_nand_defconfig +1 -0
index e75297e..808a981 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND_BOOT"
 CONFIG_NAND_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/ls1021aqds_nor_SECURE_BOOT_defconfig +1 -0
index a54cfc6..ce53a4c 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_nor_defconfig +1 -0
index 84ab1bd..21c8705 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_nor_lpuart_defconfig +1 -0
index 074d18e..88344ba 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="LPUART"
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021aqds_qspi_defconfig +1 -0
index ad40e12..f4efb45 100644
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 CONFIG_QSPI_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/ls1021aqds_sdcard_ifc_defconfig +1 -0
index 6812bfb..7a35354 100644
@@ -15,6 +15,7 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/ls1021aqds_sdcard_qspi_defconfig +1 -0
index e226071..f8a3d50 100644
@@ -15,6 +15,7 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/ls1021atwr_nor_SECURE_BOOT_defconfig +1 -0
index e5a0eca..fdbcbf0 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021atwr_nor_defconfig +1 -0
index 43ba7fe..dce1592 100644
@@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021atwr_nor_lpuart_defconfig +1 -0
index 8cfaeaf..cd37246 100644
@@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="LPUART"
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GREPENV=y
configs/ls1021atwr_qspi_defconfig +1 -0
index 4762425..07f7023 100644
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 CONFIG_QSPI_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +1 -0
index 25760e4..ab1a558 100644
@@ -15,6 +15,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SECURE_BOOT"
 CONFIG_BOOTDELAY=0
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_CRYPTO_SUPPORT=y
 CONFIG_SPL_HASH_SUPPORT=y
configs/ls1021atwr_sdcard_ifc_defconfig +1 -0
index 5f9efdf..52dc6f0 100644
@@ -15,6 +15,7 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/ls1021atwr_sdcard_qspi_defconfig +1 -0
index e272ea7..6e7289e 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/lschlv2_defconfig +1 -0
index 5393084..834d822 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_LSXL=y
 CONFIG_IDENT_STRING=" LS-CHLv2"
 CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/lsxhl_defconfig +1 -0
index 48bacaa..fb7d90f 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_LSXL=y
 CONFIG_IDENT_STRING=" LS-XHL"
 CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/lwmon5_defconfig +1 -0
index b6a0bef..609a218 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_LWMON5=y
 CONFIG_FIT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
configs/m28evk_defconfig +1 -0
index 2bfed59..2707b39 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/m53evk_defconfig +1 -0
index 03a4bfd..bce58ff 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/makalu_defconfig +1 -0
index bb9ee2f..3e45de5 100644
@@ -3,6 +3,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_MAKALU=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
configs/marsboard_defconfig +1 -0
index dd94d22..a31d213 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mcx_defconfig +1 -0
index 28837f9..f9510a8 100644
@@ -5,6 +5,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_MCX=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="mcx # "
configs/microblaze-generic_defconfig +1 -0
index cf6c4b1..60c8569 100644
@@ -12,6 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=-1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_NOR_SUPPORT=y
configs/miniarm-rk3288_defconfig +1 -0
index 557fdfc..990a93a 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_MINIARM_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-miniarm"
 CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/minnowmax_defconfig +1 -0
index 3d3a30d..51d86f4 100644
@@ -15,6 +15,7 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/mt_ventoux_defconfig +1 -0
index 0fdec87..1c9d1b0 100644
@@ -4,6 +4,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_MT_VENTOUX=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=10
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="mt_ventoux => "
configs/mx23evk_defconfig +1 -0
index 8db7064..e70eaf7 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/mx28evk_auart_console_defconfig +1 -0
index f833edc..0c6a01c 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/mx28evk_defconfig +1 -0
index 1ab2747..a2da3b8 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/mx28evk_nand_defconfig +1 -0
index af35c49..8ec6026 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/mx28evk_spi_defconfig +1 -0
index 02a50bf..63a3270 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/mx51evk_defconfig +1 -0
index c903b41..d68d001 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX51EVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mx53loco_defconfig +1 -0
index b75ba01..0bd4f26 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX53LOCO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mx6cuboxi_defconfig +1 -0
index 27c3d3b..6edc8b7 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx6dlsabreauto_defconfig +1 -0
index f9fda50..be8739f 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mx6dlsabresd_defconfig +1 -0
index dc28694..f6c702a 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mx6qpsabreauto_defconfig +1 -0
index c34d834..d46cca1 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mx6qsabreauto_defconfig +1 -0
index bf4c465..7de4166 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mx6qsabrelite_defconfig +1 -0
index 4b42d08..7e592c5 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mx6qsabresd_defconfig +1 -0
index d1385c7..b502299 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mx6sabresd_spl_defconfig +1 -0
index e9edba6..9cfeae9 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx6sxsabresd_defconfig +1 -0
index c9bd1f0..96209e5 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SXSABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/mx6sxsabresd_spl_defconfig +1 -0
index d013cb0..8fdd0cf 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx6ul_14x14_evk_defconfig +4 -3
index a829a18..f878970 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
@@ -30,10 +31,10 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
-CONFIG_FSL_QSPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_FSL_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
configs/mx6ul_9x9_evk_defconfig +4 -3
index eaf3cfd..4b5b41a 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
@@ -30,10 +31,10 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
-CONFIG_FSL_QSPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_FSL_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
configs/mx7dsabresd_defconfig +1 -0
index 3203551..e7a72fe 100644
@@ -6,6 +6,7 @@ CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
configs/mx7dsabresd_secure_defconfig +1 -0
index cf12cef..5a6657c 100644
@@ -6,6 +6,7 @@ CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
configs/nanopi_neo_defconfig +1 -0
index 5adf1ff..5164245 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/net2big_v2_defconfig +1 -0
index 122ed7a..e65e02d 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_NET2BIG_V2=y
 CONFIG_IDENT_STRING=" 2Big v2"
 CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="2big2> "
 # CONFIG_CMD_IMLS is not set
configs/netspace_lite_v2_defconfig +1 -0
index 0547aa6..add64ab 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" NS v2 Lite"
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 # CONFIG_CMD_IMLS is not set
configs/netspace_max_v2_defconfig +1 -0
index e72815d..f476137 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" NS Max v2"
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 # CONFIG_CMD_IMLS is not set
configs/netspace_mini_v2_defconfig +1 -0
index 1422787..9dd88d6 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" NS v2 Mini"
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 # CONFIG_CMD_IMLS is not set
configs/netspace_v2_defconfig +1 -0
index 6373255..c16b3d8 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_IDENT_STRING=" NS v2"
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 # CONFIG_CMD_IMLS is not set
configs/nitrogen6dl2g_defconfig +1 -0
index 849772f..d4d78b9 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/nitrogen6dl_defconfig +1 -0
index 4a62c56..1dd8466 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/nitrogen6q2g_defconfig +1 -0
index 68cdb89..b738812 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/nitrogen6q_defconfig +1 -0
index a380502..1012ca2 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/nitrogen6s1g_defconfig +1 -0
index 3c7b903..f0f310c 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/nitrogen6s_defconfig +1 -0
index 590bb27..ac0c3d1 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
 CONFIG_BOOTDELAY=3
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/nokia_rx51_defconfig +1 -0
index da10392..9db8b86 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_NOKIA_RX51=y
 CONFIG_BOOTDELAY=30
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Nokia RX-51 # "
 CONFIG_AUTOBOOT_KEYED=y
configs/novena_defconfig +1 -0
index 1ffdddc..dd6e8c4 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_CONSOLE_MUX=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/odroid-xu3_defconfig +1 -0
index eabf22a..1b67495 100644
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
 CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ODROID-XU3 # "
 CONFIG_CMD_BOOTZ=y
configs/odroid_defconfig +1 -0
index 76d0968..29f40af 100644
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Odroid # "
 CONFIG_CMD_BOOTZ=y
configs/omap3_pandora_defconfig +1 -0
index e101614..c749588 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_PANDORA=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Pandora # "
configs/omap3_zoom1_defconfig +1 -0
index e92d9c6..3f255ea 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_ZOOM1=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/omap4_panda_defconfig +1 -0
index e496afe..43283c2 100644
@@ -4,6 +4,7 @@ CONFIG_OMAP44XX=y
 # CONFIG_SPL_I2C_SUPPORT is not set
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_TARGET_OMAP4_PANDA=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/omap4_sdp4430_defconfig +1 -0
index ea62104..37461f9 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP44XX=y
 # CONFIG_SPL_I2C_SUPPORT is not set
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_TARGET_OMAP4_SDP4430=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/orangepi_2_defconfig +1 -0
index 2207b81..4727aca 100644
@@ -8,6 +8,7 @@ CONFIG_DRAM_ODT_EN=y
 CONFIG_USB1_VBUS_PIN="PG13"
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_lite_defconfig +1 -0
index a72d506..8545835 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-lite"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_one_defconfig +1 -0
index 5a7aba1..01b4ece 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_pc_defconfig +1 -0
index 3f8010c..910d68e 100644
@@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_pc_plus_defconfig +1 -0
index f8f6dab..f43682b 100644
@@ -8,6 +8,7 @@ CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc-plus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_plus2e_defconfig +1 -0
index cfae5f0..df05d37 100644
@@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus2e"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="MACPWR=SUNXI_GPD(6)"
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_plus_defconfig +1 -0
index 6c99aa2..bf88fef 100644
@@ -10,6 +10,7 @@ CONFIG_USB1_VBUS_PIN="PG13"
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPG(11),MACPWR=SUNXI_GPD(6)"
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
configs/origen_defconfig +1 -0
index d667b0f..9a09d43 100644
@@ -4,6 +4,7 @@ CONFIG_ARCH_EXYNOS4=y
 CONFIG_TARGET_ORIGEN=y
 CONFIG_IDENT_STRING=" for ORIGEN"
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ORIGEN # "
configs/p2371-0000_defconfig +1 -0
index 69fc1ba..e62f213 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA210=y
 CONFIG_TARGET_P2371_0000=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra210 (P2371-0000) # "
 # CONFIG_CMD_IMI is not set
configs/p2371-2180_defconfig +1 -0
index 6ccd7a3..0a30c04 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA210=y
 CONFIG_TARGET_P2371_2180=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # "
 # CONFIG_CMD_IMI is not set
configs/p2571_defconfig +1 -0
index 1fd4649..caefc3e 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA210=y
 CONFIG_TARGET_P2571=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra210 (P2571) # "
 # CONFIG_CMD_IMI is not set
configs/p2771-0000-000_defconfig +1 -0
index 4c4606a..9ffb244 100644
@@ -3,6 +3,7 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA186=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # "
 # CONFIG_CMD_IMI is not set
configs/p2771-0000-500_defconfig +1 -0
index b32df1c..4dbc46e 100644
@@ -3,6 +3,7 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA186=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # "
 # CONFIG_CMD_IMI is not set
configs/picosam9g45_defconfig +1 -0
index 2536ca7..a3a4f5d 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
configs/pine64_plus_defconfig +1 -0
index 6f82190..348cbd4 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881915
 CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
configs/plutux_defconfig +1 -0
index b1997fe..72126ef 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_PLUTUX=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra20 (Plutux) # "
 CONFIG_CMD_BOOTZ=y
configs/pm9261_defconfig +1 -0
index 361e9bb..63637e7 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_PM9261=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="pm9261> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
configs/pm9263_defconfig +1 -0
index f9f56d2..7ffde4b 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_PM9263=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="u-boot-pm9263> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
configs/popmetal-rk3288_defconfig +1 -0
index d7f60a1..2c15d87 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_POPMETAL_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-popmetal"
 CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_HUSH_PARSER=y
configs/qemu-x86_defconfig +1 -0
index 769adf6..653dff6 100644
@@ -8,6 +8,7 @@ CONFIG_GENERATE_ACPI_TABLE=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/qemu-x86_efi_payload32_defconfig +1 -0
index 75e7203..101a8ce 100644
@@ -5,6 +5,7 @@ CONFIG_MAX_CPUS=2
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/qemu-x86_efi_payload64_defconfig +1 -0
index 4bcd0dc..d8bd703 100644
@@ -5,6 +5,7 @@ CONFIG_MAX_CPUS=2
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/rainier_defconfig +1 -0
index c0e647e..744ef2d 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_SEQUOIA=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="RAINIER"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
configs/rainier_ramboot_defconfig +1 -0
index 7030fe4..8c85258 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_SEQUOIA=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="RAINIER,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
configs/riotboard_defconfig +1 -0
index 652b13f..e9e5191 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC"
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
configs/rpi_2_defconfig +1 -0
index bda4e95..69d208d 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI_2=y
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_BOOTZ=y
configs/rpi_3_32b_defconfig +1 -0
index 8e2c410..0e408d2 100644
@@ -3,6 +3,7 @@ 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_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_BOOTZ=y
configs/rpi_3_defconfig +1 -0
index b7354eb..6ad4189 100644
@@ -3,6 +3,7 @@ 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_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMLS is not set
configs/rpi_defconfig +1 -0
index ea39231..ac1f38e 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI=y
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_BOOTZ=y
configs/s5p_goni_defconfig +1 -0
index cacc443..4cbf022 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_TARGET_S5P_GONI=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Goni # "
 # CONFIG_AUTOBOOT is not set
configs/s5pc210_universal_defconfig +1 -0
index 1f14566..e956e7c 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_ARCH_EXYNOS4=y
 CONFIG_TARGET_S5PC210_UNIVERSAL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Universal # "
 CONFIG_CMD_BOOTZ=y
configs/sama5d3xek_mmc_defconfig +1 -0
index ccc0b19..8cee4c2 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/sama5d3xek_nandflash_defconfig +1 -0
index 2ed8a33..8dc5e24 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/sama5d3xek_spiflash_defconfig +1 -0
index 81be7f5..019869c 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/sama5d4ek_mmc_defconfig +1 -0
index e7398dd..f9c766a 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/sama5d4ek_nandflash_defconfig +1 -0
index e4032f9..c8456d0 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/sama5d4ek_spiflash_defconfig +1 -0
index 903ddcb..a061c4d 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/sansa_fuze_plus_defconfig +1 -0
index de07139..4ede451 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/sequoia_defconfig +1 -0
index 9bdab0b..5304bf4 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_SEQUOIA=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
configs/sequoia_ramboot_defconfig +1 -0
index 65ae39a..2a8193d 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_SEQUOIA=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds"
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
configs/smdk5250_defconfig +1 -0
index de62cb3..4189475 100644
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
 CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SMDK5250 # "
configs/smdk5420_defconfig +1 -0
index 04521f2..8715ec3 100644
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
 CONFIG_SILENT_CONSOLE=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SMDK5420 # "
configs/sniper_defconfig +1 -0
index a44082e..02b51c4 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 # CONFIG_SPL_EXT_SUPPORT is not set
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_TARGET_SNIPER=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="sniper # "
configs/socfpga_arria5_defconfig +1 -0
index d8611bd..6fd0354 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
 CONFIG_FIT=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/socfpga_cyclone5_defconfig +1 -0
index 42b71c3..c345faf 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_FIT=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/socfpga_de0_nano_soc_defconfig +1 -0
index f38e376..e880e01 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
 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_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/socfpga_is1_defconfig +1 -0
index c3217f2..671423a 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SOCFPGA_IS1=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
 CONFIG_FIT=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
configs/socfpga_mcvevk_defconfig +1 -0
index 4041b68..13903f7 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SOCFPGA_DENX_MCVEVK=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
 CONFIG_FIT=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/socfpga_sockit_defconfig +1 -0
index 58dc5b0..920084d 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
 CONFIG_FIT=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/socfpga_socrates_defconfig +1 -0
index 42af4ba..0894cce 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SOCFPGA_EBV_SOCRATES=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_FIT=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/socfpga_sr1500_defconfig +1 -0
index 814b111..9db5493 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SOCFPGA_SR1500=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
 CONFIG_FIT=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/socfpga_vining_fpga_defconfig +1 -0
index d83f1e5..faa05e5 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/socrates_defconfig +1 -0
index 75db38f..fd79510 100644
@@ -5,6 +5,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
configs/som-db5800-som-6867_defconfig +1 -0
index 4cfaeda..21deb94 100644
@@ -14,6 +14,7 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/tbs2910_defconfig +2 -1
index 0871408..7e3d84f 100644
@@ -2,9 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TBS2910=y
 CONFIG_PRE_CONSOLE_BUFFER=y
-CONFIG_PRE_CON_BUF_ADDR=0x7c000000
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
+CONFIG_PRE_CON_BUF_ADDR=0x7c000000
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Matrix U-Boot> "
 CONFIG_CMD_BOOTZ=y
configs/tec-ng_defconfig +1 -0
index 9441b17..f43652a 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_TEC_NG=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # "
 CONFIG_CMD_BOOTZ=y
configs/theadorable-x86-dfi-bt700_defconfig +1 -0
index cea91b6..27168e6 100644
@@ -14,6 +14,7 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
configs/trats2_defconfig +1 -0
index 59b73ca..e226abf 100644
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Trats2 # "
 CONFIG_CMD_BOOTZ=y
configs/trats_defconfig +1 -0
index 2773654..66c00a9 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_TRATS=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Trats # "
 CONFIG_CMD_BOOTZ=y
configs/trimslice_defconfig +1 -0
index 201a870..3b91e0d 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_TRIMSLICE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra20 (TrimSlice) # "
 CONFIG_CMD_BOOTZ=y
configs/venice2_defconfig +1 -0
index 358fc8f..72575ca 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_VENICE2=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra124 (Venice2) # "
 CONFIG_CMD_BOOTZ=y
configs/wandboard_defconfig +1 -0
index 5a91de4..345a25b 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/whistler_defconfig +1 -0
index 33aa977..8e16a92 100644
@@ -4,6 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_WHISTLER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler"
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra20 (Whistler) # "
 CONFIG_CMD_BOOTZ=y
configs/xfi3_defconfig +1 -0
index 9f0c378..55b1442 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
include/configs/B4860QDS.h +0 -3
index 8710307..311e52a 100644
@@ -485,9 +485,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_CCSRBAR+0x11C600)
 #define CONFIG_SYS_NS16550_COM3	(CONFIG_SYS_CCSRBAR+0x11D500)
 #define CONFIG_SYS_NS16550_COM4	(CONFIG_SYS_CCSRBAR+0x11D600)
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* determine from environment */
-#endif
 
 /* I2C */
 #define CONFIG_SYS_I2C
include/configs/BSC9131RDB.h +0 -2
index 92c69e5..458c3b0 100644
@@ -231,8 +231,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_NS16550_MIN_FUNCTIONS
 #endif
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* determine from environment */
-
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
include/configs/BSC9132QDS.h +0 -2
index 4276f65..059456f 100644
@@ -411,8 +411,6 @@ combinations. this should be removed later
 #define CONFIG_NS16550_MIN_FUNCTIONS
 #endif
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* determine from environment */
-
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
include/configs/C29XPCIE.h +0 -2
index a61e25c..a448e1f 100644
@@ -374,8 +374,6 @@
 #define CONFIG_NS16550_MIN_FUNCTIONS
 #endif
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
include/configs/MIP405.h +0 -1
index bf75209..b006e31 100644
@@ -105,7 +105,6 @@
 /***************************************************************
  * defines if the console is stored in the environment
  ***************************************************************/
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* stdin, stdout and stderr are in evironment */
 /***************************************************************
  * defines if an overwrite_console function exists
  *************************************************************/
include/configs/P1010RDB.h +0 -2
index ab8993b..9dca8c7 100644
@@ -578,8 +578,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_NS16550_MIN_FUNCTIONS
 #endif
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* determine from environment */
-
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
 
include/configs/PATI.h +0 -1
index ebabdff..c8d0a58 100644
@@ -57,7 +57,6 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* stdin, stdout and stderr are in evironment */
 #define CONFIG_PREBOOT
 
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory		*/
include/configs/PIP405.h +0 -1
index 7d08f0c..d6c38c7 100644
@@ -101,7 +101,6 @@
 /***************************************************************
  * defines if the console is stored in the environment
  ***************************************************************/
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* stdin, stdout and stderr are in evironment */
 /***************************************************************
  * defines if an overwrite_console function exists
  *************************************************************/
include/configs/PMC440.h +0 -2
index 956c787..aceddc4 100644
@@ -286,8 +286,6 @@
 #define CONFIG_LOGBUFFER
 #define CONFIG_SYS_POST_CACHE_ADDR	0x7fff0000	/* free virtual address     */
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* Otherwise it catches logbuffer as output */
-
 #define CONFIG_SUPPORT_VFAT
 
 /*-----------------------------------------------------------------------
include/configs/T102xQDS.h +0 -1
index eb3cfc0..6934e65 100644
@@ -494,7 +494,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_CCSRBAR+0x11C600)
 #define CONFIG_SYS_NS16550_COM3	(CONFIG_SYS_CCSRBAR+0x11D500)
 #define CONFIG_SYS_NS16550_COM4	(CONFIG_SYS_CCSRBAR+0x11D600)
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* determine from environment */
 
 /* Video */
 #ifdef CONFIG_PPC_T1024		/* no DIU on T1023 */
include/configs/T102xRDB.h +0 -1
index 0d6051e..c363719 100644
@@ -494,7 +494,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_CCSRBAR+0x11C600)
 #define CONFIG_SYS_NS16550_COM3	(CONFIG_SYS_CCSRBAR+0x11D500)
 #define CONFIG_SYS_NS16550_COM4	(CONFIG_SYS_CCSRBAR+0x11D600)
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* determine from environment */
 
 /* Video */
 #undef CONFIG_FSL_DIU_FB	/* RDB doesn't support DIU */
include/configs/T1040QDS.h +0 -1
index d64611a..5f25d55 100644
@@ -407,7 +407,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_CCSRBAR+0x11C600)
 #define CONFIG_SYS_NS16550_COM3	(CONFIG_SYS_CCSRBAR+0x11D500)
 #define CONFIG_SYS_NS16550_COM4	(CONFIG_SYS_CCSRBAR+0x11D600)
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* determine from environment */
 
 /* Video */
 #define CONFIG_FSL_DIU_FB
include/configs/T104xRDB.h +0 -3
index e115bdd..8e2f299 100644
@@ -475,9 +475,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
 #define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_CCSRBAR+0x11C600)
 #define CONFIG_SYS_NS16550_COM3	(CONFIG_SYS_CCSRBAR+0x11D500)
 #define CONFIG_SYS_NS16550_COM4	(CONFIG_SYS_CCSRBAR+0x11D600)
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	/* determine from environment */
-#endif
 
 #if defined(CONFIG_T1042RDB_PI) || defined(CONFIG_T1042D4RDB)
 /* Video */
include/configs/TQM5200.h +0 -1
index 814b879..19703cd 100644
@@ -113,7 +113,6 @@
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #endif /* #ifndef CONFIG_TQM5200S */
 
 /* Partitions */
include/configs/a3m071.h +0 -1
index cc211c5..8bb13ec 100644
@@ -54,7 +54,6 @@
 #define CONFIG_BOOTP_SERVERIP
 #define CONFIG_NET_RETRY_COUNT 3
 #define CONFIG_NETCONSOLE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_MTD_DEVICE	/* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS	/* needed for UBI */
 #define CONFIG_FLASH_CFI_MTD
include/configs/advantech_dms-ba16.h +0 -1
index 992948a..22410ce 100644
@@ -279,7 +279,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
include/configs/am3517_crane.h +0 -1
index 698c924..fdfbb55 100644
@@ -112,7 +112,6 @@
 /* USB device configuration */
 #define CONFIG_USB_DEVICE		1
 #define CONFIG_USB_TTY			1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	1
 /* Change these to suit your needs */
 #define CONFIG_USBD_VENDORID		0x0451
 #define CONFIG_USBD_PRODUCTID		0x5678
include/configs/aristainetos-common.h +0 -1
index d6d9838..a0e9076 100644
@@ -234,7 +234,6 @@
 /* check this console not needed, after test remove it */
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
include/configs/at91sam9261ek.h +0 -2
index 867bd69..591c7d4 100644
@@ -61,8 +61,6 @@
 #define CONFIG_ATMEL_LCD_BGR555
 #endif
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
 /* LED */
 #define CONFIG_AT91_LED
 #define	CONFIG_RED_LED		AT91_PIN_PA23	/* this is the power led */
include/configs/at91sam9263ek.h +0 -1
index 854caf3..ecc87ea 100644
@@ -68,7 +68,6 @@
 #define CONFIG_SYS_WHITE_ON_BLACK	1
 #define CONFIG_ATMEL_LCD		1
 #define CONFIG_ATMEL_LCD_BGR555		1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	1
 
 /* LED */
 #define CONFIG_AT91_LED
include/configs/at91sam9m10g45ek.h +0 -1
index 9968b14..e89c19b 100644
@@ -50,7 +50,6 @@
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_LCD
 #define CONFIG_ATMEL_LCD_RGB565
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 /* board specific(not enough SRAM) */
 #define CONFIG_AT91SAM9G45_LCD_BASE		0x73E00000
 
include/configs/at91sam9n12ek.h +0 -1
index c3d07a1..a54e59e 100644
@@ -49,7 +49,6 @@
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 
 /*
include/configs/at91sam9rlek.h +0 -1
index a383de6..1bbfb9e 100644
@@ -57,7 +57,6 @@
 #define CONFIG_ATMEL_LCD_RGB565		1
 /* Let board_init_f handle the framebuffer allocation */
 #undef CONFIG_FB_ADDR
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV	1
 
 /* LED */
 #define CONFIG_AT91_LED
include/configs/at91sam9x5ek.h +0 -1
index edad1dd..209e6e6 100644
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 
 /*
include/configs/bur_cfg_common.h +0 -1
index 85510f0..277f36e 100644
@@ -41,7 +41,6 @@
 
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_ENV_OVERWRITE		/* Overwrite ethaddr / serial# */
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* As stated above, the following choices are optional. */
include/configs/cgtqmx6eval.h +0 -1
index 5ee83de..6c3d98b 100644
@@ -92,7 +92,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
include/configs/cm_fx6.h +0 -2
index 46584fd..4e08846 100644
@@ -259,8 +259,6 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_CONSOLE_MUX
 #define CONFIG_VIDEO_SW_CURSOR
 
 #define CONFIG_SPLASH_SCREEN
include/configs/cm_t35.h +0 -1
index e4c9358..0cd2f3c 100644
@@ -102,7 +102,6 @@
 /* USB device configuration */
 #define CONFIG_USB_DEVICE
 #define CONFIG_USB_TTY
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 /* commands to include */
 #define CONFIG_CMD_MTDPARTS	/* Enable MTD parts commands */
include/configs/cm_t3517.h +0 -1
index a408fbf..893d637 100644
@@ -85,7 +85,6 @@
 #define CONFIG_CONS_INDEX		3
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_SERIAL3			3	/* UART3 */
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
include/configs/colibri_imx7.h +0 -1
index e911303..5ecec01 100644
@@ -230,7 +230,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP
include/configs/controlcenterd.h +0 -2
index fbe9c82..37972a8 100644
@@ -340,8 +340,6 @@
 
 #define CONFIG_SYS_EXTRA_ENV_RELOC
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
 /*
  * Command line configuration.
  */
include/configs/cyrus.h +0 -2
index c1abcb6..78eb567 100644
@@ -452,8 +452,6 @@
 #define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_SYS_USB_EVENT_POLL
  /* _VIA_CONTROL_EP  */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #endif
 
 #ifdef CONFIG_MMC
include/configs/digsy_mtc.h +0 -1
index 8cf0283..c2ad92d 100644
@@ -84,7 +84,6 @@
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(2 << 20)	/* decompressed img */
include/configs/dns325.h +0 -2
index 23c173e..68ce795 100644
@@ -77,8 +77,6 @@
 /*
  * Console configuration
  */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 /*
  * Display cpu info@boot
include/configs/ea20.h +0 -1
index f49284c..6054f88 100644
@@ -111,7 +111,6 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CMD_BMP
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #endif
 
include/configs/embestmx6boards.h +0 -1
index 809ec21..87f16d9 100644
@@ -121,7 +121,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
include/configs/exynos5-common.h +0 -2
index 111b23d..12ceb2c 100644
@@ -42,8 +42,6 @@
 /* select serial console configuration */
 #define CONFIG_BAUDRATE			115200
 #define EXYNOS5_DEFAULT_UART_OFFSET	0x010000
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_CONSOLE_MUX
 
 #define CONFIG_CMD_HASH
 
include/configs/exynos7420-common.h +0 -2
index 907b5ea..e8c0eaf 100644
@@ -54,8 +54,6 @@
 
 /* select serial console configuration */
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_CONSOLE_MUX
 
 #define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x3E00000)
 
include/configs/ge_bx50v3.h +0 -1
index 52f096e..435b0ca 100644
@@ -302,7 +302,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 
 /* Framebuffer */
include/configs/goflexhome.h +0 -2
index ae6539c..c17c5e9 100644
@@ -43,8 +43,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
include/configs/gw_ventana.h +0 -2
index f01a74a..f2b35fa 100644
@@ -184,11 +184,9 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_IPUV3_CLK          260000000
 #define CONFIG_CMD_HDMIDETECT
-#define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 #define CONFIG_VIDEO_BMP_LOGO
include/configs/h2200.h +0 -1
index 3e419c6..8e77982 100644
@@ -131,7 +131,6 @@
 
 #define CONFIG_BOOTARGS "root=/dev/ram0 ro console=ttyS0,115200n8"
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_USB_DEV_PULLUP_GPIO	33
 /* USB VBUS GPIO 3 */
 
include/configs/imx31_phycore.h +0 -1
index 50dfc11..614e2ad 100644
@@ -187,7 +187,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_CMD_BMP
 #define CONFIG_BMP_16BPP
include/configs/io64.h +0 -2
index 894da84..7f2cbd5 100644
@@ -394,8 +394,6 @@
 #define CONFIG_LOGBUFFER
 #define CONFIG_SYS_POST_CACHE_ADDR	0x00800000 /* free virtual address */
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
 /*-----------------------------------------------------------------------
  * External Bus Controller (EBC) Setup
  *----------------------------------------------------------------------*/
include/configs/ipek01.h +0 -1
index 126e02e..16eee33 100644
@@ -54,7 +54,6 @@
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP
include/configs/kc1.h +0 -2
index 32be528..61fcab2 100644
@@ -135,8 +135,6 @@
  * Console
  */
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
include/configs/kilauea.h +0 -2
index 227504f..9741398 100644
@@ -387,8 +387,6 @@
 #define CONFIG_LOGBUFFER
 #define CONFIG_SYS_POST_CACHE_ADDR	0x00800000 /* free virtual address	*/
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
-
 /*-----------------------------------------------------------------------
  * PCI stuff
  *----------------------------------------------------------------------*/
include/configs/lacie_kw.h +0 -2
index bd6c83e..3e670e6 100644
@@ -145,8 +145,6 @@
 /*
  * Console configuration
  */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 /*
  * Environment variables configurations
include/configs/ls1021aqds.h +0 -1
index a29073c..cf7d5cb 100644
@@ -456,7 +456,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_I2C_DVI_BUS_NUM	0
include/configs/ls1021atwr.h +0 -1
index d3ef614..d05141a 100644
@@ -337,7 +337,6 @@
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 #define CONFIG_FSL_DCU_SII9022A
 #define CONFIG_SYS_I2C_DVI_BUS_NUM	1
include/configs/lsxl.h +0 -1
index baa35db..6084c8e 100644
@@ -36,7 +36,6 @@
 #define CONFIG_KIRKWOOD_GPIO
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 
 /*
include/configs/lwmon5.h +0 -1
index 7b88ad5..d8398ee 100644
@@ -255,7 +255,6 @@
 /* Reserve GPT0_COMP1-COMP5 for logbuffer header */
 #define CONFIG_ALT_LH_ADDR	(CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP1)
 #define CONFIG_ALT_LB_ADDR	(CONFIG_SYS_OCM_BASE)
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
 
 /*
  * I2C
include/configs/m53evk.h +0 -1
index 5af55d8..d7c4146 100644
@@ -204,7 +204,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SPLASH_SCREEN
include/configs/ma5d4evk.h +0 -1
index b156e42..8fe5db6 100644
@@ -82,7 +82,6 @@
 #define LCD_BPP				LCD_COLOR16
 #define LCD_OUTPUT_BPP                  24
 #define CONFIG_ATMEL_HLCD
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #endif
 
 /*
include/configs/makalu.h +0 -2
index dcfe3d7..dea340d 100644
@@ -252,8 +252,6 @@
 #define CONFIG_LOGBUFFER
 #define CONFIG_SYS_POST_CACHE_ADDR	0x00800000 /* free virtual address	*/
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
-
 /*-----------------------------------------------------------------------
  * PCI stuff
  *----------------------------------------------------------------------*/
include/configs/mcx.h +0 -1
index b6a710f..428fe58 100644
@@ -378,6 +378,5 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_OMAP3
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 #endif /* __CONFIG_H */
include/configs/microblaze-generic.h +0 -2
index a07bcc6..b11afb9 100644
@@ -256,8 +256,6 @@
 
 #define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
 /* Enable flat device tree support */
 #define CONFIG_LMB		1
 
include/configs/mt_ventoux.h +0 -1
index 29564d7..5f44d5f 100644
@@ -58,7 +58,6 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_OMAP3	/* DSS Support			*/
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 #define	CONFIG_EXTRA_ENV_SETTINGS	CONFIG_TAM3517_SETTINGS \
 	"bootcmd=run net_nfs\0"
include/configs/mx51evk.h +0 -1
index 072aafd..7a3f1f3 100644
@@ -100,7 +100,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
include/configs/mx53loco.h +0 -1
index d259f53..69245f1 100644
@@ -219,7 +219,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
include/configs/mx6cuboxi.h +0 -2
index 237ef04..d48fcc2 100644
@@ -38,7 +38,6 @@
 #define CONFIG_IPUV3_CLK		260000000
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -48,7 +47,6 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_CMD_HDMIDETECT
 #define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_CONSOLE_MUX
 
 /* USB */
 #define CONFIG_USB_EHCI
include/configs/mx6sabre_common.h +0 -1
index 7423cff..3276940 100644
@@ -212,7 +212,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
include/configs/mx6sxsabresd.h +0 -1
index 4c61999..70f2162 100644
@@ -212,7 +212,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP
include/configs/mx6ul_14x14_evk.h +0 -1
index 925a418..37bd13e 100644
@@ -235,7 +235,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP
include/configs/mx7dsabresd.h +0 -1
index 83f3d95..b58e6c7 100644
@@ -259,7 +259,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP
include/configs/mxs.h +0 -1
index d15dd5f..634556d 100644
@@ -147,7 +147,6 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #endif
 
 /* MMC */
include/configs/nitrogen6x.h +0 -2
index 6ad4a3e..c66a936 100644
@@ -96,7 +96,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
@@ -106,7 +105,6 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_IPUV3_CLK 260000000
 #define CONFIG_CMD_HDMIDETECT
-#define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
include/configs/nokia_rx51.h +0 -1
index 41ebd6d..5a2d419 100644
@@ -118,7 +118,6 @@
 #define CONFIG_USBD_MANUFACTURER	"Nokia"
 #define CONFIG_USBD_PRODUCT_NAME	"N900"
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_NO_FLASH
 
 /* commands to include */
include/configs/novena.h +0 -2
index 8cb0282..cba0604 100644

Lines of this file are not shown. View the raw message.

include/configs/odroid.h +0 -1
index a28244d..704d1e7 100644

Lines of this file are not shown. View the raw message.

include/configs/omap3_evm.h +0 -1
index 740b588..4cdf178 100644

Lines of this file are not shown. View the raw message.

include/configs/omap3_igep00x0.h +0 -1
index 9ca648d..a54575a 100644

Lines of this file are not shown. View the raw message.

include/configs/omap3_pandora.h +0 -1
index fce50f5..25c6077 100644

Lines of this file are not shown. View the raw message.

include/configs/omap3_zoom1.h +0 -1
index 6397051..8c056e9 100644

Lines of this file are not shown. View the raw message.

include/configs/origen.h +0 -1
index 0f76d32..a075b54 100644

Lines of this file are not shown. View the raw message.

include/configs/picosam9g45.h +0 -1
index 206bfa7..8ebf336 100644

Lines of this file are not shown. View the raw message.

include/configs/pm9261.h +0 -1
index 537a6d8..fbb7146 100644

Lines of this file are not shown. View the raw message.

include/configs/pm9263.h +0 -1
index 9993248..a4672b0 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3288_common.h +0 -5
index 7ac3a5e..d033866 100644

Lines of this file are not shown. View the raw message.

include/configs/rpi.h +0 -2
index 8d4ad5d..decf35a 100644

Lines of this file are not shown. View the raw message.

include/configs/s5p_goni.h +0 -1
index 72286dd..87d169a 100644

Lines of this file are not shown. View the raw message.

include/configs/s5pc210_universal.h +0 -1
index 9915306..e2d814f 100644

Lines of this file are not shown. View the raw message.

include/configs/sama5d2_xplained.h +0 -1
index e684d2a..c20d6f9 100644

Lines of this file are not shown. View the raw message.

include/configs/sama5d3xek.h +0 -1
index 8b73a1b..c149e5b 100644

Lines of this file are not shown. View the raw message.

include/configs/sama5d4_xplained.h +0 -1
index c90e1e6..0890cf5 100644

Lines of this file are not shown. View the raw message.

include/configs/sama5d4ek.h +0 -1
index b9927e9..36da48c 100644

Lines of this file are not shown. View the raw message.

include/configs/sandbox.h +0 -2
index bd005fc..b6533c3 100644

Lines of this file are not shown. View the raw message.

include/configs/sequoia.h +0 -2
index ac783d3..1afe374 100644

Lines of this file are not shown. View the raw message.

include/configs/snapper9g45.h +0 -2
index aab286f..6ccb31d 100644

Lines of this file are not shown. View the raw message.

include/configs/sniper.h +0 -2
index 3bc9819..3fe5983 100644

Lines of this file are not shown. View the raw message.

include/configs/socfpga_common.h +0 -1
index e1faf38..39dcd51 100644

Lines of this file are not shown. View the raw message.

include/configs/socrates.h +0 -1
index 29f9522..85cc457 100644

Lines of this file are not shown. View the raw message.

include/configs/sunxi-common.h +0 -3
index c604ce2..e7cf038 100644

Lines of this file are not shown. View the raw message.

include/configs/tbs2910.h +0 -2
index ddd53dd..d470e04 100644

Lines of this file are not shown. View the raw message.

include/configs/tegra-common.h +0 -2
index 1385d31..78024af 100644

Lines of this file are not shown. View the raw message.

include/configs/ti_omap4_common.h +0 -1
index 4115c78..52c0563 100644

Lines of this file are not shown. View the raw message.

include/configs/trats.h +0 -1
index 22b0c90..9fc6513 100644

Lines of this file are not shown. View the raw message.

include/configs/trats2.h +0 -1
index 1febaae..c437c13 100644

Lines of this file are not shown. View the raw message.

include/configs/wandboard.h +0 -1
index 69d0fd5..1b99719 100644

Lines of this file are not shown. View the raw message.

include/configs/x86-common.h +0 -2
index 74b2522..42c8f0a 100644

Lines of this file are not shown. View the raw message.

scripts/config_whitelist.txt +0 -2
index 7a69be5..5e2f8ce 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.8.0.rc3.226.g39d4020

Part of the diff is not shown here. View the raw message.

#12 lore raw

PATCH v3 4/29 Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al to Kconfig

Quoted 5 lines · Simon Glass

This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_IS_IN_ENV
CONFIG_CONSOLE_MUX

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160930/90221fd6/attachment.sig>
#13 lore raw

PATCH v3 5/29 config: Drop CONFIG_CONSOLE

In reply to Simon Glass

This is not really a config. Rename it to avoid confusion.

---

Changes in v3: None
Changes in v2: None

 include/configs/MPC8349ITX.h | 6 +++---
 scripts/config_whitelist.txt | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
include/configs/MPC8349ITX.h +3 -3
index 177718e..0fbc1fd 100644
@@ -358,7 +358,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_SYS_BAUDRATE_TABLE  \
 		{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
 
-#define CONFIG_CONSOLE		ttyS0
+#define CONSOLE			ttyS0
 #define CONFIG_BAUDRATE		115200
 
 #define CONFIG_SYS_NS16550_COM1	(CONFIG_SYS_IMMR + 0x4500)
@@ -740,10 +740,10 @@ boards, we say we have two, but don't display a message if we find only one. */
 		__stringify(CONFIG_GATEWAYIP) ":"	\
 		__stringify(CONFIG_NETMASK) ":"		\
 		CONFIG_HOSTNAME ":" CONFIG_NETDEV ":off"		\
-	" console=" __stringify(CONFIG_CONSOLE) "," __stringify(CONFIG_BAUDRATE)
+	" console=" __stringify(CONSOLE) "," __stringify(CONFIG_BAUDRATE)
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"console=" __stringify(CONFIG_CONSOLE) "\0"			\
+	"console=" __stringify(CONSOLE) "\0"			\
 	"netdev=" CONFIG_NETDEV "\0"					\
 	"uboot=" CONFIG_UBOOTPATH "\0"					\
 	"tftpflash=tftpboot $loadaddr $uboot; "				\
scripts/config_whitelist.txt +0 -1
index 5e2f8ce..d66282a 100644
@@ -674,7 +674,6 @@ CONFIG_COMMON_ENV_SETTINGS
 CONFIG_COMMON_ENV_UBI
 CONFIG_COMPACT_FLASH
 CONFIG_COMPAT
-CONFIG_CONSOLE
 CONFIG_CONSOLE_DEV
 CONFIG_CONSOLE_EXTRA_INFO
 CONFIG_CONSOLE_INFO_QUIET
Signature · 1 line
2.8.0.rc3.226.g39d4020
#14 lore raw

PATCH v3 5/29 config: Drop CONFIG_CONSOLE

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 4 lines

This is not really a config. Rename it to avoid confusion.

Quoted 8 lines

---

Changes in v3: None
Changes in v2: None

  include/configs/MPC8349ITX.h | 6 +++---
  scripts/config_whitelist.txt | 1 -
  2 files changed, 3 insertions(+), 4 deletions(-)

good catch

bye,
Heiko

Quoted 40 lines
include/configs/MPC8349ITX.h +3 -3
index 177718e..0fbc1fd 100644
@@ -358,7 +358,7 @@ boards, we say we have two, but don't display a message if we find only one. */
  #define CONFIG_SYS_BAUDRATE_TABLE  \
  		{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
 
-#define CONFIG_CONSOLE		ttyS0
+#define CONSOLE			ttyS0
  #define CONFIG_BAUDRATE		115200
 
  #define CONFIG_SYS_NS16550_COM1	(CONFIG_SYS_IMMR + 0x4500)
@@ -740,10 +740,10 @@ boards, we say we have two, but don't display a message if we find only one. */
  		__stringify(CONFIG_GATEWAYIP) ":"	\
  		__stringify(CONFIG_NETMASK) ":"		\
  		CONFIG_HOSTNAME ":" CONFIG_NETDEV ":off"		\
-	" console=" __stringify(CONFIG_CONSOLE) "," __stringify(CONFIG_BAUDRATE)
+	" console=" __stringify(CONSOLE) "," __stringify(CONFIG_BAUDRATE)
 
  #define CONFIG_EXTRA_ENV_SETTINGS \
-	"console=" __stringify(CONFIG_CONSOLE) "\0"			\
+	"console=" __stringify(CONSOLE) "\0"			\
  	"netdev=" CONFIG_NETDEV "\0"					\
  	"uboot=" CONFIG_UBOOTPATH "\0"					\
  	"tftpflash=tftpboot $loadaddr $uboot; "				\
scripts/config_whitelist.txt +0 -1
index 5e2f8ce..d66282a 100644
@@ -674,7 +674,6 @@ CONFIG_COMMON_ENV_SETTINGS
  CONFIG_COMMON_ENV_UBI
  CONFIG_COMPACT_FLASH
  CONFIG_COMPAT
-CONFIG_CONSOLE
  CONFIG_CONSOLE_DEV
  CONFIG_CONSOLE_EXTRA_INFO
  CONFIG_CONSOLE_INFO_QUIET
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#15 lore raw

PATCH v3 6/29 config: Drop CONFIG_CONSOLE_DEV

In reply to Simon Glass

This is not really a config. Rename it to avoid confusion.

---

Changes in v3: None
Changes in v2: None

 include/configs/advantech_dms-ba16.h  | 4 ++--
 include/configs/aristainetos-common.h | 2 +-
 include/configs/aristainetos.h        | 2 +-
 include/configs/aristainetos2.h       | 2 +-
 include/configs/aristainetos2b.h      | 2 +-
 include/configs/cgtqmx6eval.h         | 4 ++--
 include/configs/el6x_common.h         | 2 +-
 include/configs/embestmx6boards.h     | 2 +-
 include/configs/ge_bx50v3.h           | 4 ++--
 include/configs/mx6cuboxi.h           | 4 ++--
 include/configs/mx6qsabreauto.h       | 2 +-
 include/configs/mx6sabre_common.h     | 2 +-
 include/configs/mx6sabresd.h          | 2 +-
 include/configs/o2dnt-common.h        | 6 +++---
 include/configs/pcm058.h              | 2 +-
 include/configs/tqma6.h               | 2 +-
 include/configs/tqma6_mba6.h          | 2 +-
 include/configs/tqma6_wru4.h          | 2 +-
 include/configs/zc5202.h              | 2 +-
 include/configs/zc5601.h              | 2 +-
 scripts/config_whitelist.txt          | 1 -
 21 files changed, 26 insertions(+), 27 deletions(-)
include/configs/advantech_dms-ba16.h +2 -2
index 22410ce..4f07f23 100644
@@ -16,7 +16,7 @@
 #define CONFIG_DEFAULT_FDT_FILE	"imx6q-dms-ba16.dtb"
 
 #define CONFIG_MXC_UART_BASE	UART4_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc3"
+#define CONSOLE_DEV	"ttymxc3"
 #define CONFIG_EXTRA_BOOTARGS	"panic=10"
 
 #define CONFIG_BOOT_DIR	""
@@ -117,7 +117,7 @@
 	"fdt_addr=0x18000000\0" \
 	"boot_fdt=yes\0" \
 	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"initrd_high=0xffffffff\0" \
 	"sddev=0\0" \
include/configs/aristainetos-common.h +1 -1
index a0e9076..3401f66 100644
@@ -57,7 +57,7 @@
 	"rescue_sys_length=f10000\0" \
 	"panel=lb07wv8\0" \
 	"splashpos=m,m\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"initrd_high=0xffffffff\0" \
 	"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
include/configs/aristainetos.h +1 -1
index be93deb..1799cc1 100644
@@ -18,7 +18,7 @@
 #define CONFIG_BOARDNAME	"aristainetos"
 
 #define CONFIG_MXC_UART_BASE	UART5_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc4"
+#define CONSOLE_DEV	"ttymxc4"
 
 #define CONFIG_FEC_XCV_TYPE		RMII
 
include/configs/aristainetos2.h +1 -1
index 152f5e9..8fa3eb5 100644
@@ -19,7 +19,7 @@
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc1"
+#define CONSOLE_DEV	"ttymxc1"
 
 #define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_PHY_MICREL_KSZ9031
include/configs/aristainetos2b.h +1 -1
index 78791db..df9b5c9 100644
@@ -19,7 +19,7 @@
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc1"
+#define CONSOLE_DEV	"ttymxc1"
 
 #define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_PHY_MICREL_KSZ9031
include/configs/cgtqmx6eval.h +2 -2
index 6c3d98b..8090200 100644
@@ -128,7 +128,7 @@
 /* Command definition */
 
 #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc1"
+#define CONSOLE_DEV	"ttymxc1"
 #define CONFIG_MMCROOT		"/dev/mmcblk0p2"
 #define CONFIG_SYS_MMC_ENV_DEV		0
 
@@ -140,7 +140,7 @@
 	"fdt_addr_r=0x18000000\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
 	"dfuspi=dfu 0 sf 0:0:10000000:0\0" \
 	"dfu_alt_info_spl=spl raw 0x400\0" \
 	"dfu_alt_info_img=u-boot raw 0x10000\0" \
include/configs/el6x_common.h +1 -1
index 81b79b2..7e9bcb1 100644
@@ -73,7 +73,7 @@
 	"board="__stringify(CONFIG_BOARD_NAME)"\0"                              \
 	"cma_size="__stringify(EL6Q_CMA_SIZE)"\0"                               \
 	"chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0"                     \
-	"console=" CONFIG_CONSOLE_DEV "\0" 					\
+	"console=" CONSOLE_DEV "\0"					\
 	"fdtfile=undefined\0" \
 	"fdt_high=0xffffffff\0" \
 	"fdt_addr_r=0x18000000\0" \
include/configs/embestmx6boards.h +1 -1
index 87f16d9..6266d95 100644
@@ -14,7 +14,7 @@
 #define __RIOTBOARD_CONFIG_H
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
 
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
include/configs/ge_bx50v3.h +2 -2
index 435b0ca..cf805b3 100644
@@ -30,7 +30,7 @@
 #endif
 
 #define CONFIG_MXC_UART_BASE	UART3_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc2"
+#define CONSOLE_DEV	"ttymxc2"
 
 #define CONFIG_SUPPORT_EMMC_BOOT
 
@@ -139,7 +139,7 @@
 	"fdt_addr=0x18000000\0" \
 	"boot_fdt=yes\0" \
 	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"initrd_high=0xffffffff\0" \
 	"sddev=0\0" \
include/configs/mx6cuboxi.h +2 -2
index d48fcc2..6e4a4f8 100644
@@ -72,7 +72,7 @@
 /* Command definition */
 
 #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc0"
+#define CONSOLE_DEV	"ttymxc0"
 #define CONFIG_SYS_FSL_USDHC_NUM	1
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* SDHC2 */
 
@@ -90,7 +90,7 @@
 	"initrd_high=0xffffffff\0" \
 	"fdt_high=0xffffffff\0" \
 	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
 	"bootm_size=0x10000000\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
 	"update_sd_firmware=" \
include/configs/mx6qsabreauto.h +1 -1
index 9cf3c2c..f849f34 100644
@@ -11,7 +11,7 @@
 
 #define CONFIG_MACH_TYPE	3529
 #define CONFIG_MXC_UART_BASE	UART4_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc3"
+#define CONSOLE_DEV		"ttymxc3"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 
 /* USB Configs */
include/configs/mx6sabre_common.h +1 -1
index 3276940..32ebb51 100644
@@ -74,7 +74,7 @@
 	"fdt_addr=0x18000000\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
 	"dfuspi=dfu 0 sf 0:0:10000000:0\0" \
 	"dfu_alt_info_spl=spl raw 0x400\0" \
 	"dfu_alt_info_img=u-boot raw 0x10000\0" \
include/configs/mx6sabresd.h +1 -1
index 5c2734d..789c407 100644
@@ -15,7 +15,7 @@
 
 #define CONFIG_MACH_TYPE	3980
 #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc0"
+#define CONSOLE_DEV		"ttymxc0"
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
 
 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
include/configs/o2dnt-common.h +3 -3
index 8913784..e9cf190 100644
@@ -95,8 +95,8 @@
 
 #undef	CONFIG_BOOTARGS
 
-#if !defined(CONFIG_CONSOLE_DEV)
-#define CONFIG_CONSOLE_DEV	"ttyPSC1"
+#if !defined(CONSOLE_DEV)
+#define CONSOLE_DEV	"ttyPSC1"
 #endif
 
 /*
@@ -131,7 +131,7 @@
 	"addmem=setenv bootargs ${bootargs} ${memlimit}\0"		\
 	"addmisc=sete bootargs ${bootargs} ${miscargs}\0"		\
 	"addtty=sete bootargs ${bootargs} console="			\
-		CONFIG_CONSOLE_DEV ",${baudrate}\0"			\
+		CONSOLE_DEV ",${baudrate}\0"			\
 	"bootfile="CONFIG_BOARD_NAME"/uImage_"CONFIG_BOARD_NAME"_act\0"	\
 	"kernel_addr_r=600000\0"					\
 	"initrd_high=0x03e00000\0"					\
include/configs/pcm058.h +1 -1
index c36245b..2869c4e 100644
@@ -24,7 +24,7 @@
 /* Serial */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	       UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
 
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
include/configs/tqma6.h +1 -1
index 029eddd..983153f 100644
@@ -295,7 +295,7 @@
 	"uboot=u-boot.imx\0"                                                   \
 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0"                               \
 	"fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0"                          \
-	"console=" CONFIG_CONSOLE_DEV "\0"                                     \
+	"console=" CONSOLE_DEV "\0"                                     \
 	"fdt_high=0xffffffff\0"                                                \
 	"initrd_high=0xffffffff\0"                                             \
 	"addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0"  \
include/configs/tqma6_mba6.h +1 -1
index 2f52598..3cae4fe 100644
@@ -25,6 +25,6 @@
 #define CONFIG_PHY_KSZ9031
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
 
 #endif /* __CONFIG_TQMA6_MBA6_H */
include/configs/tqma6_wru4.h +1 -1
index 8896bc3..3e88391 100644
@@ -21,7 +21,7 @@
 
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART4_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc3"
+#define CONSOLE_DEV		"ttymxc3"
 
 #define CONFIG_MISC_INIT_R
 
include/configs/zc5202.h +1 -1
index 073a42c..8e75c40 100644
@@ -10,7 +10,7 @@
 #define __EL_ZC5202_H
 
 #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 
 #define CONFIG_DEFAULT_FDT_FILE	"imx6q-zc5202.dtb"
include/configs/zc5601.h +1 -1
index 28b9c6b..6ede668 100644
@@ -11,7 +11,7 @@
 
 
 #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p1"
 
 #define CONFIG_DEFAULT_FDT_FILE	"imx6q-zc5601.dtb"
scripts/config_whitelist.txt +0 -1
index d66282a..56a8354 100644
@@ -674,7 +674,6 @@ CONFIG_COMMON_ENV_SETTINGS
 CONFIG_COMMON_ENV_UBI
 CONFIG_COMPACT_FLASH
 CONFIG_COMPAT
-CONFIG_CONSOLE_DEV
 CONFIG_CONSOLE_EXTRA_INFO
 CONFIG_CONSOLE_INFO_QUIET
 CONFIG_CONSOLE_SCROLL_LINES
Signature · 1 line
2.8.0.rc3.226.g39d4020
#16 lore raw

PATCH v3 6/29 config: Drop CONFIG_CONSOLE_DEV

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 23 lines

This is not really a config. Rename it to avoid confusion.

---

Changes in v3: None
Changes in v2: None

  include/configs/advantech_dms-ba16.h  | 4 ++--
  include/configs/aristainetos-common.h | 2 +-
  include/configs/aristainetos.h        | 2 +-
  include/configs/aristainetos2.h       | 2 +-
  include/configs/aristainetos2b.h      | 2 +-
  include/configs/cgtqmx6eval.h         | 4 ++--
  include/configs/el6x_common.h         | 2 +-
  include/configs/embestmx6boards.h     | 2 +-
  include/configs/ge_bx50v3.h           | 4 ++--
  include/configs/mx6cuboxi.h           | 4 ++--
  include/configs/mx6qsabreauto.h       | 2 +-
  include/configs/mx6sabre_common.h     | 2 +-
  include/configs/mx6sabresd.h          | 2 +-
  include/configs/o2dnt-common.h        | 6 +++---
Quoted 8 lines
  include/configs/pcm058.h              | 2 +-
  include/configs/tqma6.h               | 2 +-
  include/configs/tqma6_mba6.h          | 2 +-
  include/configs/tqma6_wru4.h          | 2 +-
  include/configs/zc5202.h              | 2 +-
  include/configs/zc5601.h              | 2 +-
  scripts/config_whitelist.txt          | 1 -
  21 files changed, 26 insertions(+), 27 deletions(-)

bye,
Heiko

Quoted 320 lines
include/configs/advantech_dms-ba16.h +2 -2
index 22410ce..4f07f23 100644
@@ -16,7 +16,7 @@
  #define CONFIG_DEFAULT_FDT_FILE	"imx6q-dms-ba16.dtb"
 
  #define CONFIG_MXC_UART_BASE	UART4_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc3"
+#define CONSOLE_DEV	"ttymxc3"
  #define CONFIG_EXTRA_BOOTARGS	"panic=10"
 
  #define CONFIG_BOOT_DIR	""
@@ -117,7 +117,7 @@
  	"fdt_addr=0x18000000\0" \
  	"boot_fdt=yes\0" \
  	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
  	"fdt_high=0xffffffff\0"	  \
  	"initrd_high=0xffffffff\0" \
  	"sddev=0\0" \
include/configs/aristainetos-common.h +1 -1
index a0e9076..3401f66 100644
@@ -57,7 +57,7 @@
  	"rescue_sys_length=f10000\0" \
  	"panel=lb07wv8\0" \
  	"splashpos=m,m\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
  	"fdt_high=0xffffffff\0"	  \
  	"initrd_high=0xffffffff\0" \
  	"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
include/configs/aristainetos.h +1 -1
index be93deb..1799cc1 100644
@@ -18,7 +18,7 @@
  #define CONFIG_BOARDNAME	"aristainetos"
 
  #define CONFIG_MXC_UART_BASE	UART5_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc4"
+#define CONSOLE_DEV	"ttymxc4"
 
  #define CONFIG_FEC_XCV_TYPE		RMII
 
include/configs/aristainetos2.h +1 -1
index 152f5e9..8fa3eb5 100644
@@ -19,7 +19,7 @@
  #define CONFIG_BOARD_LATE_INIT
 
  #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc1"
+#define CONSOLE_DEV	"ttymxc1"
 
  #define CONFIG_FEC_XCV_TYPE		RGMII
  #define CONFIG_PHY_MICREL_KSZ9031
include/configs/aristainetos2b.h +1 -1
index 78791db..df9b5c9 100644
@@ -19,7 +19,7 @@
  #define CONFIG_BOARD_LATE_INIT
 
  #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc1"
+#define CONSOLE_DEV	"ttymxc1"
 
  #define CONFIG_FEC_XCV_TYPE		RGMII
  #define CONFIG_PHY_MICREL_KSZ9031
include/configs/cgtqmx6eval.h +2 -2
index 6c3d98b..8090200 100644
@@ -128,7 +128,7 @@
  /* Command definition */
 
  #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc1"
+#define CONSOLE_DEV	"ttymxc1"
  #define CONFIG_MMCROOT		"/dev/mmcblk0p2"
  #define CONFIG_SYS_MMC_ENV_DEV		0
 
@@ -140,7 +140,7 @@
  	"fdt_addr_r=0x18000000\0" \
  	"boot_fdt=try\0" \
  	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
  	"dfuspi=dfu 0 sf 0:0:10000000:0\0" \
  	"dfu_alt_info_spl=spl raw 0x400\0" \
  	"dfu_alt_info_img=u-boot raw 0x10000\0" \
include/configs/el6x_common.h +1 -1
index 81b79b2..7e9bcb1 100644
@@ -73,7 +73,7 @@
  	"board="__stringify(CONFIG_BOARD_NAME)"\0"                              \
  	"cma_size="__stringify(EL6Q_CMA_SIZE)"\0"                               \
  	"chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0"                     \
-	"console=" CONFIG_CONSOLE_DEV "\0" 					\
+	"console=" CONSOLE_DEV "\0"					\
  	"fdtfile=undefined\0" \
  	"fdt_high=0xffffffff\0" \
  	"fdt_addr_r=0x18000000\0" \
include/configs/embestmx6boards.h +1 -1
index 87f16d9..6266d95 100644
@@ -14,7 +14,7 @@
  #define __RIOTBOARD_CONFIG_H
 
  #define CONFIG_MXC_UART_BASE		UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
  #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
 
  #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
include/configs/ge_bx50v3.h +2 -2
index 435b0ca..cf805b3 100644
@@ -30,7 +30,7 @@
  #endif
 
  #define CONFIG_MXC_UART_BASE	UART3_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc2"
+#define CONSOLE_DEV	"ttymxc2"
 
  #define CONFIG_SUPPORT_EMMC_BOOT
 
@@ -139,7 +139,7 @@
  	"fdt_addr=0x18000000\0" \
  	"boot_fdt=yes\0" \
  	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
  	"fdt_high=0xffffffff\0"	  \
  	"initrd_high=0xffffffff\0" \
  	"sddev=0\0" \
include/configs/mx6cuboxi.h +2 -2
index d48fcc2..6e4a4f8 100644
@@ -72,7 +72,7 @@
  /* Command definition */
 
  #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONFIG_CONSOLE_DEV	"ttymxc0"
+#define CONSOLE_DEV	"ttymxc0"
  #define CONFIG_SYS_FSL_USDHC_NUM	1
  #define CONFIG_SYS_MMC_ENV_DEV		0	/* SDHC2 */
 
@@ -90,7 +90,7 @@
  	"initrd_high=0xffffffff\0" \
  	"fdt_high=0xffffffff\0" \
  	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
  	"bootm_size=0x10000000\0" \
  	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
  	"update_sd_firmware=" \
include/configs/mx6qsabreauto.h +1 -1
index 9cf3c2c..f849f34 100644
@@ -11,7 +11,7 @@
 
  #define CONFIG_MACH_TYPE	3529
  #define CONFIG_MXC_UART_BASE	UART4_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc3"
+#define CONSOLE_DEV		"ttymxc3"
  #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 
  /* USB Configs */
include/configs/mx6sabre_common.h +1 -1
index 3276940..32ebb51 100644
@@ -74,7 +74,7 @@
  	"fdt_addr=0x18000000\0" \
  	"boot_fdt=try\0" \
  	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
  	"dfuspi=dfu 0 sf 0:0:10000000:0\0" \
  	"dfu_alt_info_spl=spl raw 0x400\0" \
  	"dfu_alt_info_img=u-boot raw 0x10000\0" \
include/configs/mx6sabresd.h +1 -1
index 5c2734d..789c407 100644
@@ -15,7 +15,7 @@
 
  #define CONFIG_MACH_TYPE	3980
  #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc0"
+#define CONSOLE_DEV		"ttymxc0"
  #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
 
  #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
include/configs/o2dnt-common.h +3 -3
index 8913784..e9cf190 100644
@@ -95,8 +95,8 @@
 
  #undef	CONFIG_BOOTARGS
 
-#if !defined(CONFIG_CONSOLE_DEV)
-#define CONFIG_CONSOLE_DEV	"ttyPSC1"
+#if !defined(CONSOLE_DEV)
+#define CONSOLE_DEV	"ttyPSC1"
  #endif
 
  /*
@@ -131,7 +131,7 @@
  	"addmem=setenv bootargs ${bootargs} ${memlimit}\0"		\
  	"addmisc=sete bootargs ${bootargs} ${miscargs}\0"		\
  	"addtty=sete bootargs ${bootargs} console="			\
-		CONFIG_CONSOLE_DEV ",${baudrate}\0"			\
+		CONSOLE_DEV ",${baudrate}\0"			\
  	"bootfile="CONFIG_BOARD_NAME"/uImage_"CONFIG_BOARD_NAME"_act\0"	\
  	"kernel_addr_r=600000\0"					\
  	"initrd_high=0x03e00000\0"					\
include/configs/pcm058.h +1 -1
index c36245b..2869c4e 100644
@@ -24,7 +24,7 @@
  /* Serial */
  #define CONFIG_MXC_UART
  #define CONFIG_MXC_UART_BASE	       UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
 
  #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
include/configs/tqma6.h +1 -1
index 029eddd..983153f 100644
@@ -295,7 +295,7 @@
  	"uboot=u-boot.imx\0"                                                   \
  	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0"                               \
  	"fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0"                          \
-	"console=" CONFIG_CONSOLE_DEV "\0"                                     \
+	"console=" CONSOLE_DEV "\0"                                     \
  	"fdt_high=0xffffffff\0"                                                \
  	"initrd_high=0xffffffff\0"                                             \
  	"addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0"  \
include/configs/tqma6_mba6.h +1 -1
index 2f52598..3cae4fe 100644
@@ -25,6 +25,6 @@
  #define CONFIG_PHY_KSZ9031
 
  #define CONFIG_MXC_UART_BASE		UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
 
  #endif /* __CONFIG_TQMA6_MBA6_H */
include/configs/tqma6_wru4.h +1 -1
index 8896bc3..3e88391 100644
@@ -21,7 +21,7 @@
 
  /* UART */
  #define CONFIG_MXC_UART_BASE		UART4_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc3"
+#define CONSOLE_DEV		"ttymxc3"
 
  #define CONFIG_MISC_INIT_R
 
include/configs/zc5202.h +1 -1
index 073a42c..8e75c40 100644
@@ -10,7 +10,7 @@
  #define __EL_ZC5202_H
 
  #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
  #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 
  #define CONFIG_DEFAULT_FDT_FILE	"imx6q-zc5202.dtb"
include/configs/zc5601.h +1 -1
index 28b9c6b..6ede668 100644
@@ -11,7 +11,7 @@
 
 
  #define CONFIG_MXC_UART_BASE	UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
+#define CONSOLE_DEV		"ttymxc1"
  #define CONFIG_MMCROOT			"/dev/mmcblk0p1"
 
  #define CONFIG_DEFAULT_FDT_FILE	"imx6q-zc5601.dtb"
scripts/config_whitelist.txt +0 -1
index d66282a..56a8354 100644
@@ -674,7 +674,6 @@ CONFIG_COMMON_ENV_SETTINGS
  CONFIG_COMMON_ENV_UBI
  CONFIG_COMPACT_FLASH
  CONFIG_COMPAT
-CONFIG_CONSOLE_DEV
  CONFIG_CONSOLE_EXTRA_INFO
  CONFIG_CONSOLE_INFO_QUIET
  CONFIG_CONSOLE_SCROLL_LINES
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#17 lore raw

PATCH v3 7/29 Convert CONFIG_VIDEO to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_VIDEO

---

Changes in v3: None
Changes in v2: None

 README                                                  | 5 -----
 configs/MIP405T_defconfig                               | 1 +
 configs/MIP405_defconfig                                | 1 +
 configs/MPC8536DS_36BIT_defconfig                       | 1 +
 configs/MPC8536DS_SDCARD_defconfig                      | 1 +
 configs/MPC8536DS_SPIFLASH_defconfig                    | 1 +
 configs/MPC8536DS_defconfig                             | 1 +
 configs/MPC8544DS_defconfig                             | 1 +
 configs/MPC8572DS_36BIT_defconfig                       | 1 +
 configs/MPC8572DS_defconfig                             | 1 +
 configs/MPC8610HPCD_defconfig                           | 1 +
 configs/MPC8641HPCN_36BIT_defconfig                     | 1 +
 configs/MPC8641HPCN_defconfig                           | 1 +
 configs/MiniFAP_defconfig                               | 1 +
 configs/PIP405_defconfig                                | 1 +
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig             | 1 +
 configs/T1024QDS_DDR4_defconfig                         | 1 +
 configs/T1024QDS_NAND_defconfig                         | 1 +
 configs/T1024QDS_SDCARD_defconfig                       | 1 +
 configs/T1024QDS_SECURE_BOOT_defconfig                  | 1 +
 configs/T1024QDS_SPIFLASH_defconfig                     | 1 +
 configs/T1024QDS_defconfig                              | 1 +
 configs/T1040QDS_DDR4_defconfig                         | 1 +
 configs/T1040QDS_SECURE_BOOT_defconfig                  | 1 +
 configs/T1040QDS_defconfig                              | 1 +
 configs/T1042D4RDB_NAND_defconfig                       | 1 +
 configs/T1042D4RDB_SDCARD_defconfig                     | 1 +
 configs/T1042D4RDB_SECURE_BOOT_defconfig                | 1 +
 configs/T1042D4RDB_SPIFLASH_defconfig                   | 1 +
 configs/T1042D4RDB_defconfig                            | 1 +
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig          | 1 +
 configs/T1042RDB_PI_NAND_defconfig                      | 1 +
 configs/T1042RDB_PI_SDCARD_defconfig                    | 1 +
 configs/T1042RDB_PI_SPIFLASH_defconfig                  | 1 +
 configs/T1042RDB_PI_defconfig                           | 1 +
 configs/TQM5200_B_HIGHBOOT_defconfig                    | 1 +
 configs/TQM5200_B_defconfig                             | 1 +
 configs/TQM5200_STK100_defconfig                        | 1 +
 configs/TQM5200_defconfig                               | 1 +
 configs/aristainetos2_defconfig                         | 1 +
 configs/aristainetos2b_defconfig                        | 1 +
 configs/aristainetos_defconfig                          | 1 +
 configs/bayleybay_defconfig                             | 1 +
 configs/cgtqmx6eval_defconfig                           | 1 +
 configs/charon_defconfig                                | 1 +
 configs/chromebook_link_defconfig                       | 1 +
 configs/chromebox_panther_defconfig                     | 1 +
 configs/cm-bf548_defconfig                              | 1 +
 configs/cm_fx6_defconfig                                | 1 +
 configs/colibri_imx7_defconfig                          | 1 +
 configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
 configs/conga-qeval20-qa3-e3845_defconfig               | 1 +
 configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig   | 1 +
 configs/controlcenterd_36BIT_SDCARD_defconfig           | 1 +
 configs/coreboot-x86_defconfig                          | 1 +
 configs/crownbay_defconfig                              | 1 +
 configs/dfi-bt700-q7x-151_defconfig                     | 1 +
 configs/digsy_mtc_RAMBOOT_defconfig                     | 1 +
 configs/digsy_mtc_defconfig                             | 1 +
 configs/digsy_mtc_rev5_RAMBOOT_defconfig                | 1 +
 configs/digsy_mtc_rev5_defconfig                        | 1 +
 configs/dms-ba16-1g_defconfig                           | 1 +
 configs/dms-ba16_defconfig                              | 1 +
 configs/ea20_defconfig                                  | 1 +
 configs/eb_cpu5282_defconfig                            | 1 +
 configs/eb_cpu5282_internal_defconfig                   | 1 +
 configs/fo300_defconfig                                 | 1 +
 configs/gwventana_defconfig                             | 1 +
 configs/icon_defconfig                                  | 1 +
 configs/imx31_phycore_eet_defconfig                     | 1 +
 configs/ipek01_defconfig                                | 1 +
 configs/ls1021aqds_ddr4_nor_defconfig                   | 1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig            | 1 +
 configs/ls1021aqds_nand_defconfig                       | 1 +
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig            | 1 +
 configs/ls1021aqds_nor_defconfig                        | 1 +
 configs/ls1021aqds_nor_lpuart_defconfig                 | 1 +
 configs/ls1021aqds_qspi_defconfig                       | 1 +
 configs/ls1021aqds_sdcard_ifc_defconfig                 | 1 +
 configs/ls1021aqds_sdcard_qspi_defconfig                | 1 +
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig            | 1 +
 configs/ls1021atwr_nor_defconfig                        | 1 +
 configs/ls1021atwr_nor_lpuart_defconfig                 | 1 +
 configs/ls1021atwr_qspi_defconfig                       | 1 +
 configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig     | 1 +
 configs/ls1021atwr_sdcard_ifc_defconfig                 | 1 +
 configs/ls1021atwr_sdcard_qspi_defconfig                | 1 +
 configs/lwmon5_defconfig                                | 1 +
 configs/m28evk_defconfig                                | 1 +
 configs/m53evk_defconfig                                | 1 +
 configs/marsboard_defconfig                             | 1 +
 configs/mcx_defconfig                                   | 1 +
 configs/minnowmax_defconfig                             | 1 +
 configs/mt_ventoux_defconfig                            | 1 +
 configs/mx23evk_defconfig                               | 1 +
 configs/mx28evk_auart_console_defconfig                 | 1 +
 configs/mx28evk_defconfig                               | 1 +
 configs/mx28evk_nand_defconfig                          | 1 +
 configs/mx28evk_spi_defconfig                           | 1 +
 configs/mx51evk_defconfig                               | 1 +
 configs/mx53loco_defconfig                              | 1 +
 configs/mx6cuboxi_defconfig                             | 1 +
 configs/mx6dlsabreauto_defconfig                        | 1 +
 configs/mx6dlsabresd_defconfig                          | 1 +
 configs/mx6qpsabreauto_defconfig                        | 1 +
 configs/mx6qsabreauto_defconfig                         | 1 +
 configs/mx6qsabrelite_defconfig                         | 1 +
 configs/mx6qsabresd_defconfig                           | 1 +
 configs/mx6sabresd_spl_defconfig                        | 1 +
 configs/mx6sxsabresd_defconfig                          | 1 +
 configs/mx6sxsabresd_spl_defconfig                      | 1 +
 configs/mx6ul_14x14_evk_defconfig                       | 1 +
 configs/mx6ul_9x9_evk_defconfig                         | 1 +
 configs/mx7dsabresd_defconfig                           | 1 +
 configs/mx7dsabresd_secure_defconfig                    | 1 +
 configs/nitrogen6dl2g_defconfig                         | 1 +
 configs/nitrogen6dl_defconfig                           | 1 +
 configs/nitrogen6q2g_defconfig                          | 1 +
 configs/nitrogen6q_defconfig                            | 1 +
 configs/nitrogen6s1g_defconfig                          | 1 +
 configs/nitrogen6s_defconfig                            | 1 +
 configs/nokia_rx51_defconfig                            | 1 +
 configs/novena_defconfig                                | 1 +
 configs/pdm360ng_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/riotboard_defconfig                             | 1 +
 configs/rut_defconfig                                   | 1 +
 configs/sansa_fuze_plus_defconfig                       | 1 +
 configs/socrates_defconfig                              | 1 +
 configs/som-db5800-som-6867_defconfig                   | 1 +
 configs/tbs2910_defconfig                               | 1 +
 configs/theadorable-x86-dfi-bt700_defconfig             | 1 +
 configs/theadorable_debug_defconfig                     | 1 +
 configs/theadorable_defconfig                           | 1 +
 configs/wandboard_defconfig                             | 1 +
 configs/xfi3_defconfig                                  | 1 +
 drivers/video/Kconfig                                   | 9 +++++++++
 include/configs/MIP405.h                                | 1 -
 include/configs/MPC8536DS.h                             | 1 -
 include/configs/MPC8544DS.h                             | 1 -
 include/configs/MPC8572DS.h                             | 1 -
 include/configs/MPC8610HPCD.h                           | 1 -
 include/configs/MPC8641HPCN.h                           | 1 -
 include/configs/P1022DS.h                               | 2 --
 include/configs/PIP405.h                                | 1 -
 include/configs/T102xQDS.h                              | 1 -
 include/configs/T102xRDB.h                              | 1 -
 include/configs/T1040QDS.h                              | 1 -
 include/configs/T104xRDB.h                              | 1 -
 include/configs/TQM5200.h                               | 1 -
 include/configs/advantech_dms-ba16.h                    | 1 -
 include/configs/aria.h                                  | 1 -
 include/configs/aristainetos-common.h                   | 1 -
 include/configs/bf527-ezkit.h                           | 3 ---
 include/configs/bf533-stamp.h                           | 1 -
 include/configs/bf548-ezkit.h                           | 1 -
 include/configs/cgtqmx6eval.h                           | 1 -
 include/configs/cm-bf548.h                              | 1 -
 include/configs/cm_fx6.h                                | 1 -
 include/configs/colibri_imx7.h                          | 1 -
 include/configs/controlcenterd.h                        | 1 -
 include/configs/cougarcanyon2.h                         | 1 -
 include/configs/digsy_mtc.h                             | 1 -
 include/configs/ea20.h                                  | 1 -
 include/configs/eb_cpu5282.h                            | 2 --
 include/configs/efi-x86.h                               | 1 -
 include/configs/embestmx6boards.h                       | 1 -
 include/configs/galileo.h                               | 1 -
 include/configs/gw_ventana.h                            | 1 -
 include/configs/icon.h                                  | 1 -
 include/configs/imx31_phycore.h                         | 1 -
 include/configs/ipek01.h                                | 1 -
 include/configs/ls1021aqds.h                            | 1 -
 include/configs/ls1021atwr.h                            | 1 -
 include/configs/lwmon5.h                                | 1 -
 include/configs/m28evk.h                                | 1 -
 include/configs/m53evk.h                                | 1 -
 include/configs/mcx.h                                   | 1 -
 include/configs/mpc5121ads.h                            | 1 -
 include/configs/mt_ventoux.h                            | 1 -
 include/configs/mx23evk.h                               | 2 --
 include/configs/mx28evk.h                               | 1 -
 include/configs/mx51evk.h                               | 1 -
 include/configs/mx53loco.h                              | 1 -
 include/configs/mx6cuboxi.h                             | 1 -
 include/configs/mx6sabre_common.h                       | 1 -
 include/configs/mx6sxsabresd.h                          | 1 -
 include/configs/mx6ul_14x14_evk.h                       | 1 -
 include/configs/mx7dsabresd.h                           | 1 -
 include/configs/nitrogen6x.h                            | 1 -
 include/configs/nokia_rx51.h                            | 1 -
 include/configs/novena.h                                | 1 -
 include/configs/pdm360ng.h                              | 1 -
 include/configs/pxm2.h                                  | 1 -
 include/configs/rut.h                                   | 1 -
 include/configs/sansa_fuze_plus.h                       | 2 --
 include/configs/sequoia.h                               | 1 -
 include/configs/socrates.h                              | 1 -
 include/configs/tbs2910.h                               | 1 -
 include/configs/theadorable.h                           | 1 -
 include/configs/wandboard.h                             | 1 -
 include/configs/x86-common.h                            | 1 -
 include/configs/xfi3.h                                  | 2 --
 206 files changed, 147 insertions(+), 78 deletions(-)
README +0 -5
index 638f1e3..c222663 100644
@@ -1713,11 +1713,6 @@ CBFS (Coreboot Filesystem) support
 		instead.
 
 - Video support:
-		CONFIG_VIDEO
-
-		Define this to enable video support (for output to
-		video).
-
 		CONFIG_VIDEO_CT69000
 
 		Enable Chips & Technologies 69000 Video chip
configs/MIP405T_defconfig +1 -0
index 0f4f12f..3adc776 100644
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_IDENT_STRING="\n(c) 2003 by MPL AG Switzerland, MEV-10082-001 released"
+CONFIG_VIDEO=y
 CONFIG_4xx=y
 CONFIG_TARGET_MIP405T=y
 CONFIG_BOOTDELAY=5
configs/MIP405_defconfig +1 -0
index b749a41..740d4e5 100644
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_IDENT_STRING="\n(c) 2003 by MPL AG Switzerland, MEV-10072-001 released"
+CONFIG_VIDEO=y
 CONFIG_4xx=y
 CONFIG_TARGET_MIP405=y
 CONFIG_BOOTDELAY=5
configs/MPC8536DS_36BIT_defconfig +1 -0
index 27d5826..e6a73ab 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_PHYS_64BIT=y
configs/MPC8536DS_SDCARD_defconfig +1 -0
index eaeacca..78b11d6 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_OF_BOARD_SETUP=y
configs/MPC8536DS_SPIFLASH_defconfig +1 -0
index 525ccad..f161b61 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_OF_BOARD_SETUP=y
configs/MPC8536DS_defconfig +1 -0
index 0ff061b..aebf39d 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_OF_BOARD_SETUP=y
configs/MPC8544DS_defconfig +1 -0
index 13bbe84..d337b7a 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8544DS=y
 CONFIG_OF_BOARD_SETUP=y
configs/MPC8572DS_36BIT_defconfig +1 -0
index ec57018..1f17fa0 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8572DS=y
 CONFIG_PHYS_64BIT=y
configs/MPC8572DS_defconfig +1 -0
index 0639b4f..0b744df 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8572DS=y
 CONFIG_FIT=y
configs/MPC8610HPCD_defconfig +1 -0
index 10607e8..2c03ba2 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8610HPCD=y
 CONFIG_OF_BOARD_SETUP=y
configs/MPC8641HPCN_36BIT_defconfig +1 -0
index 2292360..0c3d60b 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8641HPCN=y
 CONFIG_PHYS_64BIT=y
configs/MPC8641HPCN_defconfig +1 -0
index d8f74b3..d2250ec 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8641HPCN=y
 CONFIG_OF_BOARD_SETUP=y
configs/MiniFAP_defconfig +1 -0
index aec6b9a..31602ab 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
configs/PIP405_defconfig +1 -0
index 02c9c1b..7f46376 100644
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_IDENT_STRING="\n(c) 2002 by MPL AG Switzerland, MEV-10066-001 released"
+CONFIG_VIDEO=y
 CONFIG_4xx=y
 CONFIG_TARGET_PIP405=y
 CONFIG_BOOTDELAY=5
configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +1 -0
index 93637e4..c46576d 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 # CONFIG_SYS_MALLOC_F is not set
configs/T1024QDS_DDR4_defconfig +1 -0
index ac419b4..7c1a07a 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_FIT=y
configs/T1024QDS_NAND_defconfig +1 -0
index 6ed4e9e..4069fa6 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_FIT=y
configs/T1024QDS_SDCARD_defconfig +1 -0
index 243b2b1..901668d 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_FIT=y
configs/T1024QDS_SECURE_BOOT_defconfig +1 -0
index e3a249f..c38aa6b 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 # CONFIG_SYS_MALLOC_F is not set
configs/T1024QDS_SPIFLASH_defconfig +1 -0
index 8a8b854..8b8dddd 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_FIT=y
configs/T1024QDS_defconfig +1 -0
index b5c6c1e..fac904e 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_FIT=y
configs/T1040QDS_DDR4_defconfig +1 -0
index 8526426..7e336e7 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
 CONFIG_FIT=y
configs/T1040QDS_SECURE_BOOT_defconfig +1 -0
index 6dee606..65fa78b 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
 # CONFIG_SYS_MALLOC_F is not set
configs/T1040QDS_defconfig +1 -0
index 716490b..8fbb287 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
 CONFIG_FIT=y
configs/T1042D4RDB_NAND_defconfig +1 -0
index ce34ec1..e40fe49 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042D4RDB_SDCARD_defconfig +1 -0
index 63e88df..2665b05 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042D4RDB_SECURE_BOOT_defconfig +1 -0
index 9035ab9..1d2548b 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 # CONFIG_SYS_MALLOC_F is not set
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index b26304c..611881f 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042D4RDB_defconfig +1 -0
index ff39f15..7f172cd 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +1 -0
index 3e4e9e2..c80db93 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042RDB_PI_NAND_defconfig +1 -0
index 5fd9c1e..cebe3c9 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042RDB_PI_SDCARD_defconfig +1 -0
index 95a4c8a..433c856 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042RDB_PI_SPIFLASH_defconfig +1 -0
index f05e33c..6c3ba81 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042RDB_PI_defconfig +1 -0
index 07faad5..8932572 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/TQM5200_B_HIGHBOOT_defconfig +1 -0
index 353fdc1..cdba626 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
configs/TQM5200_B_defconfig +1 -0
index ec3655d..ddd356b 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
configs/TQM5200_STK100_defconfig +1 -0
index 823e2ae..541a37a 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
configs/TQM5200_defconfig +1 -0
index c47ff76..1d31439 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
configs/aristainetos2_defconfig +1 -0
index 2f1e4da..b7443d9 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ARISTAINETOS2=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
configs/aristainetos2b_defconfig +1 -0
index 708bc24..d365606 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ARISTAINETOS2B=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
configs/aristainetos_defconfig +1 -0
index de00afd..a1d2c4e 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ARISTAINETOS=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
configs/bayleybay_defconfig +1 -0
index fd4d9fb..aa4bfe0 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="bayleybay"
 CONFIG_TARGET_BAYLEYBAY=y
configs/cgtqmx6eval_defconfig +1 -0
index f1ee51d..85080b6 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/charon_defconfig +1 -0
index 8517f2b..a7e60b7 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_CHARON=y
 CONFIG_OF_BOARD_SETUP=y
configs/chromebook_link_defconfig +1 -0
index 9d8f6fb..39b4f73 100644
@@ -1,5 +1,6 @@
 CONFIG_X86=y
 CONFIG_SYS_MALLOC_F_LEN=0x1800
+CONFIG_VIDEO=y
 CONFIG_VENDOR_GOOGLE=y
 CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
 CONFIG_TARGET_CHROMEBOOK_LINK=y
configs/chromebox_panther_defconfig +1 -0
index cc68c6a..4e24d60 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_GOOGLE=y
 CONFIG_DEFAULT_DEVICE_TREE="chromebox_panther"
 CONFIG_TARGET_CHROMEBOX_PANTHER=y
configs/cm-bf548_defconfig +1 -0
index bcf6d8f..f749392 100644
@@ -1,4 +1,5 @@
 CONFIG_BLACKFIN=y
+# CONFIG_VIDEO is not set
 CONFIG_TARGET_CM_BF548=y
 CONFIG_BOOTDELAY=5
 CONFIG_SILENT_CONSOLE=y
configs/cm_fx6_defconfig +1 -0
index 12b75ae..2c2715f 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
 CONFIG_BOOTDELAY=3
configs/colibri_imx7_defconfig +1 -0
index 1f7525b..faf25ca 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX7=y
 CONFIG_TARGET_COLIBRI_IMX7=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +1 -0
index d8a7d42..e869bff 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_CONGATEC=y
 CONFIG_TARGET_CONGA_QEVAL20_QA3_E3845=y
 CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845"
configs/conga-qeval20-qa3-e3845_defconfig +1 -0
index 1bd53fc..bbad68e 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_CONGATEC=y
 CONFIG_TARGET_CONGA_QEVAL20_QA3_E3845=y
 CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845"
configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +1 -0
index cdd466a..91c15a6 100644
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_IDENT_STRING=" controlcenterd 0.01"
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_PHYS_64BIT=y
configs/controlcenterd_36BIT_SDCARD_defconfig +1 -0
index 28951e0..203a043 100644
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_IDENT_STRING=" controlcenterd 0.01"
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_PHYS_64BIT=y
configs/coreboot-x86_defconfig +1 -0
index c2294c5..693302c 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_COREBOOT=y
 CONFIG_TARGET_COREBOOT=y
 CONFIG_FIT=y
configs/crownbay_defconfig +1 -0
index 838d86c..5d90bd2 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="crownbay"
 CONFIG_TARGET_CROWNBAY=y
configs/dfi-bt700-q7x-151_defconfig +1 -0
index 0cf60eb..3ae2aa5 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_DFI=y
 CONFIG_DEFAULT_DEVICE_TREE="dfi-bt700-q7x-151"
 CONFIG_TARGET_DFI_BT700=y
configs/digsy_mtc_RAMBOOT_defconfig +1 -0
index 2494412..695f5bb 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_OF_BOARD_SETUP=y
configs/digsy_mtc_defconfig +1 -0
index 1f4c15c..2fae7a4 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_OF_BOARD_SETUP=y
configs/digsy_mtc_rev5_RAMBOOT_defconfig +1 -0
index 8d77864..a0541d1 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_OF_BOARD_SETUP=y
configs/digsy_mtc_rev5_defconfig +1 -0
index 56e14e1..c66328d 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_OF_BOARD_SETUP=y
configs/dms-ba16-1g_defconfig +1 -0
index 5042a82..f0dcb1d 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ADVANTECH_DMS_BA16=y
 CONFIG_SYS_DDR_1G=y
+CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
configs/dms-ba16_defconfig +1 -0
index da741b4..468b3a7 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ADVANTECH_DMS_BA16=y
+CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
configs/ea20_defconfig +1 -0
index 2b17a51..13411c6 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_EA20=y
+CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
configs/eb_cpu5282_defconfig +1 -0
index bf9177b..daaa345 100644
@@ -1,4 +1,5 @@
 CONFIG_M68K=y
+CONFIG_VIDEO=y
 CONFIG_TARGET_EB_CPU5282=y
 CONFIG_SYS_TEXT_BASE=0xFF000000
 CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xFF000400"
configs/eb_cpu5282_internal_defconfig +1 -0
index 4f6de89..90e0094 100644
@@ -1,4 +1,5 @@
 CONFIG_M68K=y
+CONFIG_VIDEO=y
 CONFIG_TARGET_EB_CPU5282=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
 CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xF0000418"
configs/fo300_defconfig +1 -0
index eda7a14..49fb0dc 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_OF_BOARD_SETUP=y
configs/gwventana_defconfig +1 -0
index 6240290..678d803 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SPL_STACK_R_ADDR=0x18000000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/icon_defconfig +1 -0
index 6556fa6..565a337 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_4xx=y
 CONFIG_TARGET_ICON=y
 CONFIG_OF_BOARD_SETUP=y
configs/imx31_phycore_eet_defconfig +1 -0
index a210abb..b43c81d 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMX31_PHYCORE=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX31_PHYCORE_EET"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/ipek01_defconfig +1 -0
index 0042d3f..ee36fab 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_IPEK01=y
 CONFIG_OF_BOARD_SETUP=y
configs/ls1021aqds_ddr4_nor_defconfig +1 -0
index 746eba6..465633a 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0
index 74d5f86..14eafb9 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021aqds_nand_defconfig +1 -0
index 808a981..a5918aa 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
configs/ls1021aqds_nor_SECURE_BOOT_defconfig +1 -0
index ce53a4c..24178ef 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_VIDEO=y
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021aqds_nor_defconfig +1 -0
index 21c8705..6cb0908 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021aqds_nor_lpuart_defconfig +1 -0
index 88344ba..5a70aed 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021aqds_qspi_defconfig +1 -0
index f4efb45..49fadf8 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021aqds_sdcard_ifc_defconfig +1 -0
index 7a35354..55ff45f 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021aqds_sdcard_qspi_defconfig +1 -0
index f8a3d50..bb61e11 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021atwr_nor_SECURE_BOOT_defconfig +1 -0
index fdbcbf0..8d2124f 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_VIDEO=y
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021atwr_nor_defconfig +1 -0
index dce1592..b076675 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021atwr_nor_lpuart_defconfig +1 -0
index cd37246..7c9d4ef 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-lpuart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021atwr_qspi_defconfig +1 -0
index 07f7023..430fb5c 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +1 -0
index ab1a558..3685a54 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
configs/ls1021atwr_sdcard_ifc_defconfig +1 -0
index 52dc6f0..f7b4984 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
configs/ls1021atwr_sdcard_qspi_defconfig +1 -0
index 6e7289e..25f6741 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/lwmon5_defconfig +1 -0
index 609a218..a2259b4 100644
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_IDENT_STRING=" - v2.0"
+CONFIG_VIDEO=y
 CONFIG_4xx=y
 CONFIG_TARGET_LWMON5=y
 CONFIG_FIT=y
configs/m28evk_defconfig +1 -0
index 2707b39..15677f6 100644
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/m53evk_defconfig +1 -0
index bce58ff..aca7bc6 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
 CONFIG_BOOTDELAY=3
configs/marsboard_defconfig +1 -0
index a31d213..bc76dfd 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
configs/mcx_defconfig +1 -0
index f9510a8..18a9915 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 # CONFIG_SPL_GPIO_SUPPORT is not set
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_TARGET_MCX=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/minnowmax_defconfig +1 -0
index 51d86f4..fc38642 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="minnowmax"
 CONFIG_TARGET_MINNOWMAX=y
configs/mt_ventoux_defconfig +1 -0
index 1c9d1b0..4772a8c 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_TARGET_MT_VENTOUX=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx23evk_defconfig +1 -0
index e70eaf7..6a2afd3 100644
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
configs/mx28evk_auart_console_defconfig +1 -0
index 0c6a01c..bd00eed 100644
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC"
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx28evk_defconfig +1 -0
index a2da3b8..7692c0c 100644
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
 CONFIG_BOOTDELAY=1
configs/mx28evk_nand_defconfig +1 -0
index 8ec6026..6e7655c 100644
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND"
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx28evk_spi_defconfig +1 -0
index 63a3270..04e9f4f 100644
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx51evk_defconfig +1 -0
index d68d001..02cbf57 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX51EVK=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx53loco_defconfig +1 -0
index 0bd4f26..f42758e 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX53LOCO=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6cuboxi_defconfig +1 -0
index 6edc8b7..59ae1a1 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 CONFIG_CONSOLE_MUX=y
 CONFIG_SPL=y
configs/mx6dlsabreauto_defconfig +1 -0
index be8739f..68c1a6b 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6dlsabresd_defconfig +1 -0
index f6c702a..1dbfe53 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SABRESD=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6qpsabreauto_defconfig +1 -0
index d46cca1..1445b75 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6qsabreauto_defconfig +1 -0
index 7de4166..004206b 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6qsabrelite_defconfig +1 -0
index 7e592c5..3dab823 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 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_CONSOLE_MUX=y
configs/mx6qsabresd_defconfig +1 -0
index b502299..0f3cc7a 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SABRESD=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6sabresd_spl_defconfig +1 -0
index 9cfeae9..6d58495 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6sxsabresd_defconfig +1 -0
index 96209e5..22993ca 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SXSABRESD=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6sxsabresd_spl_defconfig +1 -0
index 8fdd0cf..42d920a 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6ul_14x14_evk_defconfig +1 -0
index f878970..9a29ff6 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6ul_9x9_evk_defconfig +1 -0
index 4b5b41a..8c5a0f3 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx7dsabresd_defconfig +1 -0
index e7a72fe..a09fb3b 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX7DSABRESD=y
 # CONFIG_ARMV7_VIRT is not set
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx7dsabresd_secure_defconfig +1 -0
index 5a6657c..7d85381 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX7DSABRESD=y
 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/nitrogen6dl2g_defconfig +1 -0
index d4d78b9..d1be7b5 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 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_CONSOLE_MUX=y
configs/nitrogen6dl_defconfig +1 -0
index 1dd8466..6212755 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 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_CONSOLE_MUX=y
configs/nitrogen6q2g_defconfig +1 -0
index b738812..d05608e 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 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_CONSOLE_MUX=y
configs/nitrogen6q_defconfig +1 -0
index 1012ca2..452a16c 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 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_CONSOLE_MUX=y
configs/nitrogen6s1g_defconfig +1 -0
index f0f310c..158df5d 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 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_CONSOLE_MUX=y
configs/nitrogen6s_defconfig +1 -0
index ac0c3d1..fb8fa4c 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 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_CONSOLE_MUX=y
configs/nokia_rx51_defconfig +1 -0
index 9db8b86..43f0552 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_NOKIA_RX51=y
+CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=30
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
configs/novena_defconfig +1 -0
index dd6e8c4..f0116f8 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_CONSOLE_MUX=y
configs/pdm360ng_defconfig +1 -0
index 42f532b..8cb3461 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_PDM360NG=y
 CONFIG_FIT=y
configs/pxm2_defconfig +1 -0
index 8b9a890..d667c9b 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50"
 CONFIG_FIT=y
configs/qemu-x86_defconfig +1 -0
index 653dff6..9bbbcd9 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
 CONFIG_SMP=y
 CONFIG_MAX_CPUS=2
configs/qemu-x86_efi_payload32_defconfig +1 -0
index 101a8ce..3dfc344 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
 CONFIG_SMP=y
 CONFIG_MAX_CPUS=2
configs/qemu-x86_efi_payload64_defconfig +1 -0
index d8bd703..87afb73 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
 CONFIG_SMP=y
 CONFIG_MAX_CPUS=2
configs/riotboard_defconfig +1 -0
index e9e5191..9ad02e4 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
configs/rut_defconfig +1 -0
index 1cf5a5f..56ba5e8 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-rut"
 CONFIG_FIT=y
configs/sansa_fuze_plus_defconfig +1 -0
index 4ede451..97a8bbf 100644
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
configs/socrates_defconfig +1 -0
index fd79510..372918f 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SOCRATES=y
 CONFIG_FIT=y
configs/som-db5800-som-6867_defconfig +1 -0
index 21deb94..355f97f 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_ADVANTECH=y
 CONFIG_TARGET_SOM_DB5800_SOM_6867=y
 CONFIG_DEFAULT_DEVICE_TREE="baytrail_som-db5800-som-6867"
configs/tbs2910_defconfig +1 -0
index 7e3d84f..0194c0c 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TBS2910=y
 CONFIG_PRE_CONSOLE_BUFFER=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
 CONFIG_PRE_CON_BUF_ADDR=0x7c000000
configs/theadorable-x86-dfi-bt700_defconfig +1 -0
index 27168e6..b110798 100644
@@ -1,4 +1,5 @@
 CONFIG_X86=y
+CONFIG_VIDEO=y
 CONFIG_VENDOR_DFI=y
 CONFIG_DEFAULT_DEVICE_TREE="theadorable-x86-dfi-bt700"
 CONFIG_TARGET_DFI_BT700=y
configs/theadorable_debug_defconfig +1 -0
index ec6a8f1..2596d78 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_FIT=y
configs/theadorable_defconfig +1 -0
index ecba1ec..dc39c18 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_FIT=y
configs/wandboard_defconfig +1 -0
index 345a25b..329d5e4 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
configs/xfi3_defconfig +1 -0
index 55b1442..3a34993 100644
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
drivers/video/Kconfig +9 -0
index 8361a71..bc246c5 100644
@@ -413,4 +413,13 @@ config VIDEO_TEGRA124
 
 source "drivers/video/bridge/Kconfig"
 
+config VIDEO
+	bool "Enable legacy video support"
+	depends on !DM_VIDEO
+	help
+	  Define this for video support, without using driver model. Some
+	  drivers use this because they are not yet converted to driver
+	  model. Video drivers typically provide a colour text console and
+	  cursor.
+
 endmenu
include/configs/MIP405.h +0 -1
index b006e31..e9101a0 100644
@@ -342,7 +342,6 @@
 /************************************************************
  * Video support
  ************************************************************/
-#define CONFIG_VIDEO			/*To enable video controller support */
 #define CONFIG_VIDEO_CT69000
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
include/configs/MPC8536DS.h +0 -1
index 3918160..5b638d9 100644
@@ -504,7 +504,6 @@
 /*#define VIDEO_IO_OFFSET	CONFIG_SYS_PCI1_IO_VIRT*/
 
 /* video */
-#define CONFIG_VIDEO
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
include/configs/MPC8544DS.h +0 -1
index d8dda87..11ba6dd 100644
@@ -277,7 +277,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*#define VIDEO_IO_OFFSET	CONFIG_SYS_PCI1_IO_VIRT*/
 
 /* video */
-#define CONFIG_VIDEO
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
include/configs/MPC8572DS.h +0 -1
index e063c7a..26849fc 100644
@@ -464,7 +464,6 @@
 #define VIDEO_IO_OFFSET		CONFIG_SYS_PCIE1_IO_VIRT
 
 /* video */
-#define CONFIG_VIDEO
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
include/configs/MPC8610HPCD.h +0 -1
index c1b9b6e..35fc2c9 100644
@@ -25,7 +25,6 @@
 
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x2c000)
-#define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
include/configs/MPC8641HPCN.h +0 -1
index 1885124..fa5b180 100644
@@ -377,7 +377,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*#define VIDEO_IO_OFFSET	CONFIG_SYS_PCIE1_IO_VIRT*/
 
 /* video */
-#define CONFIG_VIDEO
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
include/configs/P1022DS.h +0 -2
index 41e3ee8..f7f1c4d 100644
@@ -380,7 +380,6 @@
 
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x10000)
-#define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
@@ -400,7 +399,6 @@
 
 #ifdef CONFIG_ATI
 #define VIDEO_IO_OFFSET		CONFIG_SYS_PCIE1_IO_VIRT
-#define CONFIG_VIDEO
 #define CONFIG_BIOSEMU
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_ATI_RADEON_FB
include/configs/PIP405.h +0 -1
index d6c38c7..8649cdb 100644
@@ -302,7 +302,6 @@
 /************************************************************
  * Video support
  ************************************************************/
-#define CONFIG_VIDEO			/*To enable video controller support */
 #define CONFIG_VIDEO_CT69000
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
include/configs/T102xQDS.h +0 -1
index 6934e65..50e4046 100644
@@ -501,7 +501,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
-#define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
include/configs/T102xRDB.h +0 -1
index c363719..5760db9 100644
@@ -499,7 +499,6 @@ unsigned long get_board_ddr_clk(void);
 #undef CONFIG_FSL_DIU_FB	/* RDB doesn't support DIU */
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
-#define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
include/configs/T1040QDS.h +0 -1
index 5f25d55..4f320ce 100644
@@ -413,7 +413,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
-#define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
include/configs/T104xRDB.h +0 -1
index 8e2f299..31b10ee 100644
@@ -483,7 +483,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_FSL_DIU_CH7301
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x180000)
-#define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_CFB_CONSOLE_ANSI
include/configs/TQM5200.h +0 -1
index 19703cd..ed2fccf 100644
@@ -98,7 +98,6 @@
  * Video console
  */
 #ifndef CONFIG_TQM5200S		/* No graphics controller on TQM5200S */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_SM501
 #define CONFIG_VIDEO_SM501_32BPP
 #define CONFIG_CFB_CONSOLE
include/configs/advantech_dms-ba16.h +0 -1
index 4f07f23..b771242 100644
@@ -275,7 +275,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM        3
 
 /* Framebuffer */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/aria.h +0 -1
index cb50658..f91e183 100644
@@ -38,7 +38,6 @@
 #define	CONFIG_SYS_TEXT_BASE	0xFFF00000
 
 /* video */
-#undef CONFIG_VIDEO
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_CFB_CONSOLE
include/configs/aristainetos-common.h +0 -1
index 3401f66..60f2bac 100644
@@ -229,7 +229,6 @@
 #define CONFIG_IMX_WATCHDOG
 
 /* Framebuffer */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 /* check this console not needed, after test remove it */
 #define CONFIG_CFB_CONSOLE
include/configs/bf527-ezkit.h +0 -3
index ddc4a25..d945b8d 100644
@@ -134,9 +134,6 @@
 #endif
 
 /* Don't waste time transferring a logo over the UART */
-#if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART)
-/*# define CONFIG_VIDEO*/
-#endif
 
 /*
  * Video Settings
include/configs/bf533-stamp.h +0 -1
index c2466ca..ec4d93c 100644
@@ -204,7 +204,6 @@
 #endif
 
 /* define to enable splash screen support */
-/* #define CONFIG_VIDEO */
 
 /*
  * Pull in common ADI header for remaining command/environment setup
include/configs/bf548-ezkit.h +0 -1
index 811dae8..9376283 100644
@@ -167,7 +167,6 @@
 
 #define CONFIG_ADI_GPIO2
 
-#undef CONFIG_VIDEO
 #ifdef CONFIG_VIDEO
 #define EASYLOGO_HEADER < asm/bfin_logo_230x230_gzip.h >
 #define CONFIG_DEB_DMA_URGENT
include/configs/cgtqmx6eval.h +0 -1
index 8090200..03cf96c 100644
@@ -88,7 +88,6 @@
 #define CONFIG_FASTBOOT_BUF_SIZE   0x07000000
 
 /* Framebuffer */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/cm-bf548.h +0 -1
index d1aa262..c5b82f7 100644
@@ -113,7 +113,6 @@
 #ifndef __ADSPBF542__
 /* Don't waste time transferring a logo over the UART */
 # if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART)
-#  define CONFIG_VIDEO
 #  define EASYLOGO_HEADER <asm/bfin_logo_230x230_gzip.h>
 # endif
 # define CONFIG_DEB_DMA_URGENT
include/configs/cm_fx6.h +0 -1
index 4e08846..a1f11cb 100644
@@ -253,7 +253,6 @@
 #define CONFIG_SPL_SPI_LOAD
 
 /* Display */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK          260000000
 #define CONFIG_IMX_HDMI
include/configs/colibri_imx7.h +0 -1
index 5ecec01..ae0fe6e 100644
@@ -223,7 +223,6 @@
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 
-#define CONFIG_VIDEO
 #ifdef CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MXS
include/configs/controlcenterd.h +0 -1
index 37972a8..a952f62 100644
@@ -225,7 +225,6 @@
  */
 #define CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_CCSRBAR + 0x10000)
-#define CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
include/configs/cougarcanyon2.h +0 -1
index 88845dc..ab87aa8 100644
@@ -28,7 +28,6 @@
 #define CONFIG_ENV_OFFSET		0x5ff000
 
 /* Video is not supported for now */
-#undef CONFIG_VIDEO
 #undef CONFIG_CFB_CONSOLE
 
 #endif	/* __CONFIG_H */
include/configs/digsy_mtc.h +0 -1
index c2ad92d..0a960ad 100644
@@ -73,7 +73,6 @@
 /*
  * Video
  */
-#define CONFIG_VIDEO
 
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MB862xx
include/configs/ea20.h +0 -1
index 6054f88..68f597e 100644
@@ -21,7 +21,6 @@
 #define CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_VIDEO
 #define CONFIG_PREBOOT
 
 /*
include/configs/eb_cpu5282.h +0 -2
index 6d469a3..4a868c5 100644
@@ -251,8 +251,6 @@
  * VIDEO configuration
  */
 
-#define CONFIG_VIDEO
-
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_VCXK			1
 
include/configs/efi-x86.h +0 -1
index 95e46c5..7812870 100644
@@ -15,7 +15,6 @@
 
 #undef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_IS_NOWHERE
-#undef CONFIG_VIDEO
 #undef CONFIG_CFB_CONSOLE
 #undef CONFIG_SCSI_AHCI
 #undef CONFIG_SCSI
include/configs/embestmx6boards.h +0 -1
index 6266d95..97a912b 100644
@@ -117,7 +117,6 @@
 #endif
 
 /* Framebuffer */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/galileo.h +0 -1
index 40f7fba..f4aceb9 100644
@@ -32,7 +32,6 @@
 #undef CONFIG_SCSI
 
 /* Video is not supported in Quark SoC */
-#undef CONFIG_VIDEO
 #undef CONFIG_CFB_CONSOLE
 
 /* SD/MMC support */
include/configs/gw_ventana.h +0 -1
index f2b35fa..a23f4c4 100644
@@ -180,7 +180,6 @@
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 /* Framebuffer and LCD */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/icon.h +0 -1
index 7e9e7e6..7fc2da2 100644
@@ -126,7 +126,6 @@
 /*
  * Video options
  */
-#define CONFIG_VIDEO
 
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_SM501
include/configs/imx31_phycore.h +0 -1
index 614e2ad..f39dd31 100644
@@ -181,7 +181,6 @@
 
 #define CONFIG_S6E63D6
 
-#define CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MX3
 #define CONFIG_VIDEO_LOGO
include/configs/ipek01.h +0 -1
index 16eee33..42019a2 100644
@@ -44,7 +44,6 @@
 /*
  * Video configuration for LIME GDC
  */
-#define CONFIG_VIDEO
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
include/configs/ls1021aqds.h +0 -1
index cf7d5cb..141ecf2 100644
@@ -450,7 +450,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_DCU_FB
 
 #ifdef CONFIG_FSL_DCU_FB
-#define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/ls1021atwr.h +0 -1
index d05141a..e20b645 100644
@@ -331,7 +331,6 @@
 #define CONFIG_FSL_DCU_FB
 
 #ifdef CONFIG_FSL_DCU_FB
-#define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/lwmon5.h +0 -1
index d8398ee..00d0c19 100644
@@ -353,7 +353,6 @@
 #define CONFIG_PHY1_ADDR	1
 
 /* Video console */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
 #define CONFIG_CFB_CONSOLE
include/configs/m28evk.h +0 -1
index 4b95af3..a2accbf 100644
@@ -25,7 +25,6 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
-#define	CONFIG_VIDEO
 
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
include/configs/m53evk.h +0 -1
index d7c4146..e183ee8 100644
@@ -33,7 +33,6 @@
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_CMD_SATA
-#define CONFIG_VIDEO
 
 /*
  * Memory configurations
include/configs/mcx.h +0 -1
index 428fe58..480d3b5 100644
@@ -371,7 +371,6 @@
 #define CONFIG_NET_RETRY_COUNT 10
 #endif
 
-#define CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
include/configs/mpc5121ads.h +0 -1
index e329105..719335a 100644
@@ -37,7 +37,6 @@
 /* video */
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR	(CONFIG_SYS_IMMR + 0x2100)
-#define CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_SW_CURSOR
include/configs/mt_ventoux.h +0 -1
index 5f44d5f..bb3da6f 100644
@@ -51,7 +51,6 @@
 #define CONFIG_FPGA_DELAY() udelay(1)
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 
-#define CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
include/configs/mx23evk.h +0 -2
index 0de5737..208b6b8 100644
@@ -18,8 +18,6 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_VIDEO
-
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
 #define PHYS_SDRAM_1			0x40000000	/* Base address */
include/configs/mx28evk.h +0 -1
index 808736b..2d17b74 100644
@@ -23,7 +23,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_VIDEO
 
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
include/configs/mx51evk.h +0 -1
index 7a3f1f3..788740a 100644
@@ -96,7 +96,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/mx53loco.h +0 -1
index 69245f1..a4c08f3 100644
@@ -215,7 +215,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/mx6cuboxi.h +0 -1
index 6e4a4f8..e658c52 100644
@@ -33,7 +33,6 @@
 #define CONFIG_PHY_ATHEROS
 
 /* Framebuffer */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK		260000000
 #define CONFIG_CFB_CONSOLE
include/configs/mx6sabre_common.h +0 -1
index 32ebb51..dc7be11 100644
@@ -208,7 +208,6 @@
 #endif
 
 /* Framebuffer */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/mx6sxsabresd.h +0 -1
index 70f2162..66bff1e 100644
@@ -205,7 +205,6 @@
 #endif
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_VIDEO
 #ifdef CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MXS
include/configs/mx6ul_14x14_evk.h +0 -1
index 37bd13e..993be1a 100644
@@ -228,7 +228,6 @@
 #define CONFIG_IMX_THERMAL
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_VIDEO
 #ifdef CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MXS
include/configs/mx7dsabresd.h +0 -1
index b58e6c7..a7bf7f5 100644
@@ -252,7 +252,6 @@
 
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-#define CONFIG_VIDEO
 #ifdef CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_MXS
include/configs/nitrogen6x.h +0 -1
index c66a936..850d560 100644
@@ -92,7 +92,6 @@
 #define CONFIG_CMD_BMODE
 
 /* Framebuffer and LCD */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/nokia_rx51.h +0 -1
index 5a2d419..688265e 100644
@@ -230,7 +230,6 @@
  * Framebuffer
  */
 /* Video console */
-#define CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_CFB_CONSOLE_ANSI	/* Enable ANSI escape codes in framebuffer */
 #define CONFIG_VIDEO_LOGO
include/configs/novena.h +0 -1
index cba0604..7fcb2f8 100644
@@ -24,7 +24,6 @@
 #define CONFIG_FAT_WRITE
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_SATA
-#define CONFIG_VIDEO
 
 /* U-Boot general configurations */
 
include/configs/pdm360ng.h +0 -1
index e0b4d36..af4baa8 100644
@@ -39,7 +39,6 @@
 #define CONFIG_SYS_DEVICE_NULLDEV
 
 /* Video */
-#define CONFIG_VIDEO
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_CFB_CONSOLE
include/configs/pxm2.h +0 -1
index 99a201c..541005c 100644
@@ -124,7 +124,6 @@
 #endif
 #endif	/* CONFIG_SPL_BUILD */
 
-#define CONFIG_VIDEO
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
 #define CONFIG_CFB_CONSOLE
include/configs/rut.h +0 -1
index 5f62358..e19ed75 100644
@@ -118,7 +118,6 @@
 #undef CONFIG_HW_WATCHDOG
 #endif
 
-#define CONFIG_VIDEO
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
 #define CONFIG_CFB_CONSOLE
include/configs/sansa_fuze_plus.h +0 -2
index d58b963..9fcca2c 100644
@@ -14,8 +14,6 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_VIDEO
-
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
 #define PHYS_SDRAM_1			0x40000000	/* Base address */
include/configs/sequoia.h +0 -1
index 1afe374..7392fe3 100644
@@ -45,7 +45,6 @@
  * Define this if you want support for video console with radeon 9200 pci card
  * Also set CONFIG_SYS_TEXT_BASE to 0xFFF80000 in board/amcc/sequoia/config.mk in this case
  */
-#undef CONFIG_VIDEO
 
 #ifdef CONFIG_VIDEO
 /*
include/configs/socrates.h +0 -1
index 85cc457..18c496f 100644
@@ -169,7 +169,6 @@
 #define CONFIG_SYS_BR2_PRELIM		0xc80018a1	/* UPMB, 32-bit	*/
 #define CONFIG_SYS_OR2_PRELIM		0xfc000000	/* 64 MB	*/
 
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
 #define CONFIG_CFB_CONSOLE
include/configs/tbs2910.h +0 -1
index d470e04..6b1094b 100644
@@ -71,7 +71,6 @@
 #define CONFIG_PHY_ATHEROS
 
 /* Framebuffer */
-#define CONFIG_VIDEO
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK		260000000
include/configs/theadorable.h +0 -1
index d27ab9c..0c18dbf 100644
@@ -96,7 +96,6 @@
 /* Enable LCD and reserve 512KB from top of memory*/
 #define CONFIG_SYS_MEM_TOP_HIDE		0x80000
 
-#define CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
include/configs/wandboard.h +0 -1
index 1b99719..052742c 100644
@@ -74,7 +74,6 @@
 #define CONFIG_PHY_ATHEROS
 
 /* Framebuffer */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/x86-common.h +0 -1
index 42c8f0a..7547c90 100644
@@ -129,7 +129,6 @@
 /*-----------------------------------------------------------------------
  * Video Configuration
  */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_SW_CURSOR
 #define VIDEO_FB_16BPP_WORD_SWAP
 #define CONFIG_VGA_AS_SINGLE_DEVICE
include/configs/xfi3.h +0 -2
index 69558fd..d780d67 100644
@@ -14,8 +14,6 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_VIDEO
-
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
 #define PHYS_SDRAM_1			0x40000000	/* Base address */
Signature · 1 line
2.8.0.rc3.226.g39d4020
#18 lore raw

PATCH v3 7/29 Convert CONFIG_VIDEO to Kconfig

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:

Quoted 9 lines

This converts the following to Kconfig:
CONFIG_VIDEO

---

Changes in v3: None
Changes in v2: None

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany