* [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig
@ 2016-09-29 20:22 Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 01/29] Remove some merge markers Simon Glass
` (29 more replies)
0 siblings, 30 replies; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:22 UTC (permalink / raw)
To: u-boot
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
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 01/29] Remove some merge markers
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 4:39 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 02/29] Convert SILENT_CONSOLE options to Kconfig Simon Glass
` (28 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
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(-)
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index 43a67a5..261fde0 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -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;
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 0556f32..32874d7 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -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");
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 02/29] Convert SILENT_CONSOLE options to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 01/29] Remove some merge markers Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 4:41 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER " Simon Glass
` (27 subsequent siblings)
29 siblings, 2 replies; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
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(-)
diff --git a/README b/README
index bc626dc..0a1f3fe 100644
--- a/README
+++ b/README
@@ -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
diff --git a/common/Kconfig b/common/Kconfig
index c69c141..bbd5633 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -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
diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
index 828bb9b..395330d 100644
--- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig
index 7767e0d..fd1f2f0 100644
--- a/configs/T1024QDS_DDR4_defconfig
+++ b/configs/T1024QDS_DDR4_defconfig
@@ -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
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index 7173342..a62560a 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -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
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index a1c93ae..5a2f3f9 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -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
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index 371d5f6..04787a0 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index f134850..1a96a63 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index b0e9827..6f6fc86 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -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
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index 91beb24..737c648 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index 11aceb8..444d7f8 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
index 70961ec..2eada3f 100644
--- a/configs/T1024RDB_SECURE_BOOT_defconfig
+++ b/configs/T1024RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index 09fe6c4..2c0f761 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
index e013fdc..aa24d57 100644
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_NAND_defconfig b/configs/T1040D4RDB_NAND_defconfig
index e9c7708..b1d1159 100644
--- a/configs/T1040D4RDB_NAND_defconfig
+++ b/configs/T1040D4RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_SDCARD_defconfig b/configs/T1040D4RDB_SDCARD_defconfig
index 098ef3b..5a3a00f 100644
--- a/configs/T1040D4RDB_SDCARD_defconfig
+++ b/configs/T1040D4RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig
index d727450..e437f3e 100644
--- a/configs/T1040D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig
index 002346a..55671a6 100644
--- a/configs/T1040D4RDB_SPIFLASH_defconfig
+++ b/configs/T1040D4RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig
index fc28d1f..f68d6f2 100644
--- a/configs/T1040D4RDB_defconfig
+++ b/configs/T1040D4RDB_defconfig
@@ -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
diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig
index 4f470aa..bda4fb3 100644
--- a/configs/T1040QDS_DDR4_defconfig
+++ b/configs/T1040QDS_DDR4_defconfig
@@ -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
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index ae6aacf..4ec922a 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index dd53bb4..6de7d31 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -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
diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig
index 9e5a409..e144a88 100644
--- a/configs/T1040RDB_NAND_defconfig
+++ b/configs/T1040RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig
index a43304b..aa3f0f8 100644
--- a/configs/T1040RDB_SDCARD_defconfig
+++ b/configs/T1040RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
index e0887de..00e5b12 100644
--- a/configs/T1040RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig
index 1782e07..466bdd7 100644
--- a/configs/T1040RDB_SPIFLASH_defconfig
+++ b/configs/T1040RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig
index 28b7bb4..422a738 100644
--- a/configs/T1040RDB_defconfig
+++ b/configs/T1040RDB_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index d2772fe..d631eca 100644
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index f8c5d45..aeea55f 100644
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
index fa3c412..d6ceeba 100644
--- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index fca6122..66a2c44 100644
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
index f611baf..71dabd9 100644
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
index aa02cec..6d01cf2 100644
--- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index 96985ac..0377d25 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index fd5da57..1894c62 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index bf41ff5..1cb34a5 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index 7d70b57..ef8332b 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -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
diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
index 1539c85..224d1d8 100644
--- a/configs/T1042RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig
index 817c0dc..ee35e43 100644
--- a/configs/T1042RDB_defconfig
+++ b/configs/T1042RDB_defconfig
@@ -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
diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig
index 18dddd9..bf4ac25 100644
--- a/configs/a4m072_defconfig
+++ b/configs/a4m072_defconfig
@@ -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"
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index e04ff5b..f78a88c 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -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 # "
diff --git a/configs/bct-brettl2_defconfig b/configs/bct-brettl2_defconfig
index ad894a2..5dae665 100644
--- a/configs/bct-brettl2_defconfig
+++ b/configs/bct-brettl2_defconfig
@@ -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
diff --git a/configs/bf518f-ezbrd_defconfig b/configs/bf518f-ezbrd_defconfig
index e17c969..7f30237 100644
--- a/configs/bf518f-ezbrd_defconfig
+++ b/configs/bf518f-ezbrd_defconfig
@@ -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
diff --git a/configs/bf526-ezbrd_defconfig b/configs/bf526-ezbrd_defconfig
index d3cab9b..663a6a3 100644
--- a/configs/bf526-ezbrd_defconfig
+++ b/configs/bf526-ezbrd_defconfig
@@ -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
diff --git a/configs/bf527-ad7160-eval_defconfig b/configs/bf527-ad7160-eval_defconfig
index 45f4149..ccbb148 100644
--- a/configs/bf527-ad7160-eval_defconfig
+++ b/configs/bf527-ad7160-eval_defconfig
@@ -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
diff --git a/configs/bf527-ezkit-v2_defconfig b/configs/bf527-ezkit-v2_defconfig
index 3677e0a..d247280 100644
--- a/configs/bf527-ezkit-v2_defconfig
+++ b/configs/bf527-ezkit-v2_defconfig
@@ -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
diff --git a/configs/bf527-ezkit_defconfig b/configs/bf527-ezkit_defconfig
index da41fe6..f011277 100644
--- a/configs/bf527-ezkit_defconfig
+++ b/configs/bf527-ezkit_defconfig
@@ -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
diff --git a/configs/bf527-sdp_defconfig b/configs/bf527-sdp_defconfig
index fec1307..0c5c4fd 100644
--- a/configs/bf527-sdp_defconfig
+++ b/configs/bf527-sdp_defconfig
@@ -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
diff --git a/configs/bf533-ezkit_defconfig b/configs/bf533-ezkit_defconfig
index 853a5d4..53cd831 100644
--- a/configs/bf533-ezkit_defconfig
+++ b/configs/bf533-ezkit_defconfig
@@ -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
diff --git a/configs/bf533-stamp_defconfig b/configs/bf533-stamp_defconfig
index e0f5de9..f31b54b 100644
--- a/configs/bf533-stamp_defconfig
+++ b/configs/bf533-stamp_defconfig
@@ -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
diff --git a/configs/bf537-pnav_defconfig b/configs/bf537-pnav_defconfig
index bbc171d..4fd2936 100644
--- a/configs/bf537-pnav_defconfig
+++ b/configs/bf537-pnav_defconfig
@@ -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
diff --git a/configs/bf537-stamp_defconfig b/configs/bf537-stamp_defconfig
index d189ad4..b691702 100644
--- a/configs/bf537-stamp_defconfig
+++ b/configs/bf537-stamp_defconfig
@@ -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
diff --git a/configs/bf538f-ezkit_defconfig b/configs/bf538f-ezkit_defconfig
index 8507b40..4e835cc 100644
--- a/configs/bf538f-ezkit_defconfig
+++ b/configs/bf538f-ezkit_defconfig
@@ -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
diff --git a/configs/bf548-ezkit_defconfig b/configs/bf548-ezkit_defconfig
index 8514d85..19ac4e9 100644
--- a/configs/bf548-ezkit_defconfig
+++ b/configs/bf548-ezkit_defconfig
@@ -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
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index 6428d18..744eb1c 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -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
diff --git a/configs/bf561-ezkit_defconfig b/configs/bf561-ezkit_defconfig
index f8206b8..abb612c 100644
--- a/configs/bf561-ezkit_defconfig
+++ b/configs/bf561-ezkit_defconfig
@@ -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
diff --git a/configs/br4_defconfig b/configs/br4_defconfig
index db5d915..90ce839 100644
--- a/configs/br4_defconfig
+++ b/configs/br4_defconfig
@@ -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
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 3729722..9677e60 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -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
diff --git a/configs/cm-bf527_defconfig b/configs/cm-bf527_defconfig
index 773edfb..bc280a4 100644
--- a/configs/cm-bf527_defconfig
+++ b/configs/cm-bf527_defconfig
@@ -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
diff --git a/configs/cm-bf533_defconfig b/configs/cm-bf533_defconfig
index 6fa231d..5bc851a 100644
--- a/configs/cm-bf533_defconfig
+++ b/configs/cm-bf533_defconfig
@@ -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
diff --git a/configs/cm-bf537e_defconfig b/configs/cm-bf537e_defconfig
index 16f129b..db636e1 100644
--- a/configs/cm-bf537e_defconfig
+++ b/configs/cm-bf537e_defconfig
@@ -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
diff --git a/configs/cm-bf537u_defconfig b/configs/cm-bf537u_defconfig
index 68e8659..f4726b0 100644
--- a/configs/cm-bf537u_defconfig
+++ b/configs/cm-bf537u_defconfig
@@ -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
diff --git a/configs/cm-bf548_defconfig b/configs/cm-bf548_defconfig
index 0589803..bcf6d8f 100644
--- a/configs/cm-bf548_defconfig
+++ b/configs/cm-bf548_defconfig
@@ -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
diff --git a/configs/cm-bf561_defconfig b/configs/cm-bf561_defconfig
index 5a32f56..3acbc53 100644
--- a/configs/cm-bf561_defconfig
+++ b/configs/cm-bf561_defconfig
@@ -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
diff --git a/configs/cm5200_defconfig b/configs/cm5200_defconfig
index 8b98484..f8e28d9 100644
--- a/configs/cm5200_defconfig
+++ b/configs/cm5200_defconfig
@@ -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
diff --git a/configs/espresso7420_defconfig b/configs/espresso7420_defconfig
index e7163d3..e782710 100644
--- a/configs/espresso7420_defconfig
+++ b/configs/espresso7420_defconfig
@@ -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
diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index c7396a5..7ae03a6 100644
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -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
diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index a5c089b..5d25ee4 100644
--- a/configs/fennec-rk3288_defconfig
+++ b/configs/fennec-rk3288_defconfig
@@ -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
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index ba461b9..f640fce 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -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
diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index e7370d3..697a147 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -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
diff --git a/configs/ibf-dsp561_defconfig b/configs/ibf-dsp561_defconfig
index 036a92f..c598298 100644
--- a/configs/ibf-dsp561_defconfig
+++ b/configs/ibf-dsp561_defconfig
@@ -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
diff --git a/configs/ip04_defconfig b/configs/ip04_defconfig
index 277988c..1e05d3e 100644
--- a/configs/ip04_defconfig
+++ b/configs/ip04_defconfig
@@ -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
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
index 8761b60..2df48c2 100644
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -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
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index 5bb475e..7951f65 100644
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig
index 628f2d5..e75297e 100644
--- a/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index b511eb0..a54cfc6 100644
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
index a59d339..84ab1bd 100644
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index c7db8b7..074d18e 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -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
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig
index 49c88a6..ad40e12 100644
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -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
diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig
index f856ad7..6812bfb 100644
--- a/configs/ls1021aqds_sdcard_ifc_defconfig
+++ b/configs/ls1021aqds_sdcard_ifc_defconfig
@@ -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
diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig
index 09df451..e226071 100644
--- a/configs/ls1021aqds_sdcard_qspi_defconfig
+++ b/configs/ls1021aqds_sdcard_qspi_defconfig
@@ -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
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index 34cbb4d..e5a0eca 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig
index 307153f..43ba7fe 100644
--- a/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@ -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
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
index 2f95780..8cfaeaf 100644
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -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
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index e8ae266..4762425 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -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
diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
index fefd174..25760e4 100644
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig
index 68848d8..5f9efdf 100644
--- a/configs/ls1021atwr_sdcard_ifc_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_defconfig
@@ -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
diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig
index 9faba8d..e272ea7 100644
--- a/configs/ls1021atwr_sdcard_qspi_defconfig
+++ b/configs/ls1021atwr_sdcard_qspi_defconfig
@@ -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
diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig
index 6354d1a..557fdfc 100644
--- a/configs/miniarm-rk3288_defconfig
+++ b/configs/miniarm-rk3288_defconfig
@@ -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
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 8164484..eabf22a 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -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
diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig
index f3de685..42f532b 100644
--- a/configs/pdm360ng_defconfig
+++ b/configs/pdm360ng_defconfig
@@ -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
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index 9472bb0..e5f34a1 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -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 # "
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index d208d68..ddcb451 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -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 # "
diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index 112e6ae..d7f60a1 100644
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -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
diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
index e7cf5e8..a26ba61 100644
--- a/configs/pr1_defconfig
+++ b/configs/pr1_defconfig
@@ -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
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index fc9ff78..5ba7769 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -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
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index fc9b4ac..143dd09 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -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
diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 85610ed..9ad5274 100644
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -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
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index ebaf768..cd6f694 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -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
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 6e335f0..de62cb3 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -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 # "
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index c1d8c45..04521f2 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -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 # "
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 3d8c8ea..a5754f8 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -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 # "
diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index 74287ea..0c394c8 100644
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -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 # "
diff --git a/configs/tcm-bf518_defconfig b/configs/tcm-bf518_defconfig
index fd31cfc..9288e56 100644
--- a/configs/tcm-bf518_defconfig
+++ b/configs/tcm-bf518_defconfig
@@ -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
diff --git a/configs/tcm-bf537_defconfig b/configs/tcm-bf537_defconfig
index d66e499..8459390 100644
--- a/configs/tcm-bf537_defconfig
+++ b/configs/tcm-bf537_defconfig
@@ -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
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index 281eabb..5bf0c9a 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -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 # "
diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig
index 7bdf5f5..68d8fb6 100644
--- a/configs/tricorder_flash_defconfig
+++ b/configs/tricorder_flash_defconfig
@@ -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
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index f7f0acb..eb3cfc0 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -34,7 +34,6 @@
#define CONFIG_DEEP_SLEEP
#if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_SILENT_CONSOLE
#define CONFIG_BOARD_EARLY_INIT_F
#endif
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index e61c80d..0d6051e 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -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
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 9488db2..d64611a 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -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
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 02633b6..e115bdd 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -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
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 14e06fb..814b879 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -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
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 57748b4..051d44e 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -54,10 +54,6 @@
#define CONFIG_LAST_STAGE_INIT
-#if !defined(CONFIG_DONGLE)
-#define CONFIG_SILENT_CONSOLE
-#endif
-
#endif
#if defined(CONFIG_TARGET_UCP1020)
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index bdc81ff..96c6826 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -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 */
/*
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 502ddad..c401b73 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -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
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 065e700..93ba952 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -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
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 51a0d19..111b23d 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -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
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index 9e03962..907b5ea 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -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
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 0d72e69..a29073c 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -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
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index e5ac50e..d3ef614 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -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
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index 6d03d69..e0b4d36 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -37,7 +37,6 @@
/* Used for silent command in environment */
#define CONFIG_SYS_DEVICE_NULLDEV
-#define CONFIG_SILENT_CONSOLE
/* Video */
#define CONFIG_VIDEO
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index e8bf987..7ac3a5e 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -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
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 94e024b..bd005fc 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -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)
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index c1c9495..2ae108b 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -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)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index efa95f0..9e2f00d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 01/29] Remove some merge markers Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 02/29] Convert SILENT_CONSOLE options to Kconfig Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 4:43 ` Heiko Schocher
2016-09-30 6:00 ` Siarhei Siamashka
2016-09-29 20:23 ` [U-Boot] [PATCH v3 04/29] Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al " Simon Glass
` (26 subsequent siblings)
29 siblings, 2 replies; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
Move these option to Kconfig and tidy up existing uses.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
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(-)
diff --git a/README b/README
index 0a1f3fe..8f93dad 100644
--- a/README
+++ b/README
@@ -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;
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index b139d1c..c0ffeb3 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -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
diff --git a/common/Kconfig b/common/Kconfig
index bbd5633..6ee67ac 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -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
diff --git a/common/console.c b/common/console.c
index 12293f3..31a9b3e 100644
--- a/common/console.c
+++ b/common/console.c
@@ -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)
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index fbff9fe..0871408 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -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
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index dc4cbdb..e02863d 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -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 */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index d261fb3..c604ce2 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -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.
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 85501bc..ddd53dd 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -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
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9e2f00d..7a69be5 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 04/29] Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (2 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 05/29] config: Drop CONFIG_CONSOLE Simon Glass
` (25 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_IS_IN_ENV
CONFIG_CONSOLE_MUX
Signed-off-by: Simon Glass <sjg@chromium.org>
---
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(-)
diff --git a/README b/README
index 8f93dad..638f1e3 100644
--- a/README
+++ b/README
@@ -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().
diff --git a/common/Kconfig b/common/Kconfig
index 6ee67ac..0a417c9 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -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
diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig
index c192177..d3cf286 100644
--- a/configs/B4420QDS_NAND_defconfig
+++ b/configs/B4420QDS_NAND_defconfig
@@ -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
diff --git a/configs/B4420QDS_SPIFLASH_defconfig b/configs/B4420QDS_SPIFLASH_defconfig
index 2c2e3c2..2dd25fe 100644
--- a/configs/B4420QDS_SPIFLASH_defconfig
+++ b/configs/B4420QDS_SPIFLASH_defconfig
@@ -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
diff --git a/configs/B4420QDS_defconfig b/configs/B4420QDS_defconfig
index bfd64af..406241a 100644
--- a/configs/B4420QDS_defconfig
+++ b/configs/B4420QDS_defconfig
@@ -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
diff --git a/configs/B4860QDS_NAND_defconfig b/configs/B4860QDS_NAND_defconfig
index d01baaa..00fe182 100644
--- a/configs/B4860QDS_NAND_defconfig
+++ b/configs/B4860QDS_NAND_defconfig
@@ -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
diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig
index 75124a8..2923547 100644
--- a/configs/B4860QDS_SECURE_BOOT_defconfig
+++ b/configs/B4860QDS_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/B4860QDS_SPIFLASH_defconfig b/configs/B4860QDS_SPIFLASH_defconfig
index 52f78be..80e729e 100644
--- a/configs/B4860QDS_SPIFLASH_defconfig
+++ b/configs/B4860QDS_SPIFLASH_defconfig
@@ -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
diff --git a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
index cd80c91..09c8a5b 100644
--- a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
@@ -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
diff --git a/configs/B4860QDS_defconfig b/configs/B4860QDS_defconfig
index 1f642e3..31f64ab 100644
--- a/configs/B4860QDS_defconfig
+++ b/configs/B4860QDS_defconfig
@@ -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
diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
index babcdd5..e2a8103 100644
--- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
@@ -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
diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig
index ad00622..c9cfaf8 100644
--- a/configs/BSC9131RDB_NAND_defconfig
+++ b/configs/BSC9131RDB_NAND_defconfig
@@ -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
diff --git a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
index 9045567..9694709 100644
--- a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
@@ -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
diff --git a/configs/BSC9131RDB_SPIFLASH_defconfig b/configs/BSC9131RDB_SPIFLASH_defconfig
index 178618c..367ba78 100644
--- a/configs/BSC9131RDB_SPIFLASH_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
index e678144..3615b6c 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
index e6fde47..e3a76b3 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
index 1d9b541..c204783 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
index 235f304..de42f7b 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
index f193c4b..dc9e3f8 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
index 4c9c955..748a247 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
index 74c3385..bd1da16 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
index 4bc83ef..dd13d06 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
index 0bea345..8723279 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
index f16b1b1..6e56dae 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
index d24f216..ac9a16c 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
index a9555db..ca2853e 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
index 06a1770..afb14d2 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
index c86ce6f..47a037b 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
index 6f6f2dc..2087b46 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
@@ -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
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
index da71c54..d87aa5c 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
@@ -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
diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig
index 1c03d44..c3cc168 100644
--- a/configs/C29XPCIE_NAND_defconfig
+++ b/configs/C29XPCIE_NAND_defconfig
@@ -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
diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
index f932373..15d89f1 100644
--- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
+++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
@@ -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
diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
index 7f4189e..49799be 100644
--- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
@@ -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
diff --git a/configs/C29XPCIE_SPIFLASH_defconfig b/configs/C29XPCIE_SPIFLASH_defconfig
index ff16c7a..9f89263 100644
--- a/configs/C29XPCIE_SPIFLASH_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_defconfig
@@ -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
diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig
index 8dd57d2..83493d4 100644
--- a/configs/C29XPCIE_defconfig
+++ b/configs/C29XPCIE_defconfig
@@ -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
diff --git a/configs/Cubietruck_plus_defconfig b/configs/Cubietruck_plus_defconfig
index f2c6fe7..dbe3336 100644
--- a/configs/Cubietruck_plus_defconfig
+++ b/configs/Cubietruck_plus_defconfig
@@ -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
diff --git a/configs/Cyrus_P5020_defconfig b/configs/Cyrus_P5020_defconfig
index d8c8957..6495440 100644
--- a/configs/Cyrus_P5020_defconfig
+++ b/configs/Cyrus_P5020_defconfig
@@ -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
diff --git a/configs/Cyrus_P5040_defconfig b/configs/Cyrus_P5040_defconfig
index f5d3cc2..4566abb 100644
--- a/configs/Cyrus_P5040_defconfig
+++ b/configs/Cyrus_P5040_defconfig
@@ -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
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index e5910cd..0f4f12f 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -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
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index a38eac1..b749a41 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -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
diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
index 198fda9..774d137 100644
--- a/configs/Merrii_A80_Optimus_defconfig
+++ b/configs/Merrii_A80_Optimus_defconfig
@@ -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
diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig
index 266f2ce..aec6b9a 100644
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
index 864643c..986dc7f 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index fc14f50..7155011 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
index 17dd94b..f687a84 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
index 6de688f..cf42d2f 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index 4006383..f3f0fca 100644
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
index 6ff1f50..94a1c22 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index 94f1501..c56d9e3 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
index 911f607..df0cc7a 100644
--- a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index db003ef..f6943a8 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
index 9599528..50166ce 100644
--- a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
index e25da5c..6a6bcaf 100644
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index d8d069e..64959d7 100644
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
index 7050462..a4073f6 100644
--- a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index b8229fa..eea19e6 100644
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
index 55da2e4..3ac3839 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index dd170a5..406a58a 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
index 166df05..a1375b3 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
index e751041..c95c28c 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index b907459..38fbb18 100644
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
index f26fa72..f201f13 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index e87c9d6..87e23dd 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
index 7fad176..ececb7e 100644
--- a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index 11f0866..f45db61 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
index 6282ccb..ecafb24 100644
--- a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
index d477a88..231c806 100644
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index 613131a..14f67b0 100644
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
index c2238d6..524afd9 100644
--- a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
@@ -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
diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index fb7334b..591075f 100644
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig
index 80f077a..45be3bb 100644
--- a/configs/PATI_defconfig
+++ b/configs/PATI_defconfig
@@ -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
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 87f2f31..02c9c1b 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -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
diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig
index af38882..cd2f0d2 100644
--- a/configs/PMC440_defconfig
+++ b/configs/PMC440_defconfig
@@ -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"
diff --git a/configs/Sinovoip_BPI_M3_defconfig b/configs/Sinovoip_BPI_M3_defconfig
index a9c7fc1..d15ac20 100644
--- a/configs/Sinovoip_BPI_M3_defconfig
+++ b/configs/Sinovoip_BPI_M3_defconfig
@@ -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
diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
index b24d21b..fed2560 100644
--- a/configs/T1023RDB_NAND_defconfig
+++ b/configs/T1023RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig
index 7f84498..c45de13 100644
--- a/configs/T1023RDB_SDCARD_defconfig
+++ b/configs/T1023RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
index fa538f3..3e5765e 100644
--- a/configs/T1023RDB_SECURE_BOOT_defconfig
+++ b/configs/T1023RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig
index c75abbb..9ec82d5 100644
--- a/configs/T1023RDB_SPIFLASH_defconfig
+++ b/configs/T1023RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig
index af99ff0..c0fe36b 100644
--- a/configs/T1023RDB_defconfig
+++ b/configs/T1023RDB_defconfig
@@ -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
diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
index 395330d..93637e4 100644
--- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig
index fd1f2f0..ac419b4 100644
--- a/configs/T1024QDS_DDR4_defconfig
+++ b/configs/T1024QDS_DDR4_defconfig
@@ -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
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index a62560a..6ed4e9e 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -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
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index 5a2f3f9..243b2b1 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -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
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index 04787a0..e3a249f 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index 1a96a63..8a8b854 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index 6f6fc86..b5c6c1e 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -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
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index 737c648..dfc9697 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index 444d7f8..15545d8 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
index 2eada3f..43ba56b 100644
--- a/configs/T1024RDB_SECURE_BOOT_defconfig
+++ b/configs/T1024RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index 2c0f761..99d2a40 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
index aa24d57..72fc86f 100644
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_NAND_defconfig b/configs/T1040D4RDB_NAND_defconfig
index b1d1159..c420dc3 100644
--- a/configs/T1040D4RDB_NAND_defconfig
+++ b/configs/T1040D4RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_SDCARD_defconfig b/configs/T1040D4RDB_SDCARD_defconfig
index 5a3a00f..ff4bbe3 100644
--- a/configs/T1040D4RDB_SDCARD_defconfig
+++ b/configs/T1040D4RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig
index e437f3e..f548e21 100644
--- a/configs/T1040D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig
index 55671a6..00feb36 100644
--- a/configs/T1040D4RDB_SPIFLASH_defconfig
+++ b/configs/T1040D4RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig
index f68d6f2..55adc62 100644
--- a/configs/T1040D4RDB_defconfig
+++ b/configs/T1040D4RDB_defconfig
@@ -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
diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig
index bda4fb3..8526426 100644
--- a/configs/T1040QDS_DDR4_defconfig
+++ b/configs/T1040QDS_DDR4_defconfig
@@ -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
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index 4ec922a..6dee606 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index 6de7d31..716490b 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -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
diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig
index e144a88..da6ef10 100644
--- a/configs/T1040RDB_NAND_defconfig
+++ b/configs/T1040RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig
index aa3f0f8..49b6221 100644
--- a/configs/T1040RDB_SDCARD_defconfig
+++ b/configs/T1040RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
index 00e5b12..98e7855 100644
--- a/configs/T1040RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig
index 466bdd7..31ea589 100644
--- a/configs/T1040RDB_SPIFLASH_defconfig
+++ b/configs/T1040RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig
index 422a738..b898f93 100644
--- a/configs/T1040RDB_defconfig
+++ b/configs/T1040RDB_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index d631eca..ce34ec1 100644
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index aeea55f..63e88df 100644
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
index d6ceeba..9035ab9 100644
--- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index 66a2c44..b26304c 100644
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
index 71dabd9..ff39f15 100644
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
index 6d01cf2..3e4e9e2 100644
--- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index 0377d25..5fd9c1e 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index 1894c62..95a4c8a 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index 1cb34a5..f05e33c 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index ef8332b..07faad5 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -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
diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
index 224d1d8..e9d4145 100644
--- a/configs/T1042RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig
index ee35e43..8e11872 100644
--- a/configs/T1042RDB_defconfig
+++ b/configs/T1042RDB_defconfig
@@ -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
diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig
index be90d79..353fdc1 100644
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@@ -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
diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig
index a405e92..ec3655d 100644
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@@ -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
diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig
index 904fcd1..823e2ae 100644
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@@ -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
diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig
index e478f4c..c47ff76 100644
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@@ -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
diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index 9e573a7..c486bbc 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -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
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index aa09bf5..ff67718 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -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
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index a22e6b6..531f207 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -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
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 35d7e94..2f1e4da 100644
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -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
diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
index 6b2c44d..708bc24 100644
--- a/configs/aristainetos2b_defconfig
+++ b/configs/aristainetos2b_defconfig
@@ -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
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index a06d9ee..de00afd 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -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
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index f78a88c..5dd6fda 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -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 # "
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 51b3ec1..99bb49e 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -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
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index f5ffbcd..014e50e 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -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
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index c985d3a..e0e8fea 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -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
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index 09a1404..38b9635 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -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
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index 09a1404..38b9635 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -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
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index 3a18c3b..317d9c2 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -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
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index e4608d2..a26d7d1 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -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
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index 4c97c9f..8b72678 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -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
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index 1ee26d9..0293aa6 100644
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -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
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index de6cacd..777d234 100644
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -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
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
index 257593d..788e7e1 100644
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -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
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig
index 0aaa888..9604af9 100644
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -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> "
diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig
index 05140ac..e1aebb1 100644
--- a/configs/at91sam9m10g45ek_nandflash_defconfig
+++ b/configs/at91sam9m10g45ek_nandflash_defconfig
@@ -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> "
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index 3eb8666..ce62edf 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -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
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index 15e1970..3b7ebc2 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -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> "
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index ebed1db..26c93af 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -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> "
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index 69be1d2..494a630 100644
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -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
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
index c49bf18..f0ea3f0 100644
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -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
diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
index 142122e..0a414e4 100644
--- a/configs/at91sam9rlek_nandflash_defconfig
+++ b/configs/at91sam9rlek_nandflash_defconfig
@@ -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
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index beeb8cc..bb47f4a 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -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
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index eb88bbb..a7d2c9d 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -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
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index 4b28d74..b482687 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -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> "
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index 4a1ea42..5446215 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -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> "
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 64e3d31..fd4d9fb 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -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
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 503b8d1..16166fe 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -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
diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 15365b9..e990f03 100644
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -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
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 05fc1e0..8872f4a 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -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
diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index 4855acc..c04dde8 100644
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -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
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index 8fe1100..0251088 100644
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -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
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 2d361c3..afc671b 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -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
diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index fb7e2af..e5162a5 100644
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -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
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index 5a053f5..f1ee51d 100644
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -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 > "
diff --git a/configs/charon_defconfig b/configs/charon_defconfig
index 724441e..8517f2b 100644
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@@ -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
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 8c91bfe..9d8f6fb 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -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
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 2557d35..cc68c6a 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -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
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 998bc05..12b75ae 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -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 # "
diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
index dfc2539..b131b27 100644
--- a/configs/cm_t3517_defconfig
+++ b/configs/cm_t3517_defconfig
@@ -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
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index 79fa39c..9a2f624 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -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 # "
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 7c4d349..1f7525b 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -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
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index e9eabed..794d9be 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -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
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index f0da176..d8a7d42 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -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
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 63c2cbd..1bd53fc 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -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
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index 88d189a..cdd466a 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -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
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index c8679e2..28951e0 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -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
diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
index e94d72f..56179af 100644
--- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
@@ -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
diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig
index 257fa85..c40a205 100644
--- a/configs/controlcenterd_TRAILBLAZER_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_defconfig
@@ -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
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 378d75f..c2294c5 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -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
diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index a55e4a3..cfd868d 100644
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -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
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index d0cd9db..838d86c 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -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
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 3b94de4..40b6637 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -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
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 2855af5..70dfc35 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -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
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 245d0c7..0cf60eb 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -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
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig
index d0743c8..2494412 100644
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@@ -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"
diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig
index e2156a1..1f4c15c 100644
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@@ -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"
diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
index 3b7a7c1..8d77864 100644
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@@ -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"
diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig
index 75888ff..56e14e1 100644
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@@ -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"
diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index db5adcf..5042a82 100644
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -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
diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index e36f3dc..da741b4 100644
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -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
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index a26629d..59b8b7b 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -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
diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig
index 64f9cbc..351e133 100644
--- a/configs/duovero_defconfig
+++ b/configs/duovero_defconfig
@@ -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
diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index 7d0cb68..fad5526 100644
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -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
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 0e28878..2b17a51 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -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 > "
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index eb55e93..c47f314 100644
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -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
diff --git a/configs/espresso7420_defconfig b/configs/espresso7420_defconfig
index e782710..cadbc65 100644
--- a/configs/espresso7420_defconfig
+++ b/configs/espresso7420_defconfig
@@ -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
diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index 7ae03a6..b1b599a 100644
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -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
diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index 5d25ee4..2693f5d 100644
--- a/configs/fennec-rk3288_defconfig
+++ b/configs/fennec-rk3288_defconfig
@@ -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
diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index 697a147..eda7a14 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -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
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index f79ee2e..ef6ce97 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -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
diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig
index 8577167..29010f3 100644
--- a/configs/ge_b450v3_defconfig
+++ b/configs/ge_b450v3_defconfig
@@ -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
diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig
index c5f391e..e0eeb46 100644
--- a/configs/ge_b650v3_defconfig
+++ b/configs/ge_b650v3_defconfig
@@ -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
diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig
index 2c5aa05..9b4b917 100644
--- a/configs/ge_b850v3_defconfig
+++ b/configs/ge_b850v3_defconfig
@@ -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
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 22e8452..8fd3302 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -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
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 0f726ae..6240290 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -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
diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
index 22f0759..3b031e0 100644
--- a/configs/h2200_defconfig
+++ b/configs/h2200_defconfig
@@ -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
diff --git a/configs/h8_homlet_v2_defconfig b/configs/h8_homlet_v2_defconfig
index c4bd2c5..76dd833 100644
--- a/configs/h8_homlet_v2_defconfig
+++ b/configs/h8_homlet_v2_defconfig
@@ -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
diff --git a/configs/haleakala_defconfig b/configs/haleakala_defconfig
index 270d2a3..5861769 100644
--- a/configs/haleakala_defconfig
+++ b/configs/haleakala_defconfig
@@ -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
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index 0ec4ebc..4b1e95b 100644
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -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
diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
index bc0ec6a..798ef02 100644
--- a/configs/igep0030_defconfig
+++ b/configs/igep0030_defconfig
@@ -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
diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig
index 0750881..4833e62 100644
--- a/configs/igep0030_nand_defconfig
+++ b/configs/igep0030_nand_defconfig
@@ -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
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 280afbd..eb65801 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -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
diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig
index 96252c3..a210abb 100644
--- a/configs/imx31_phycore_eet_defconfig
+++ b/configs/imx31_phycore_eet_defconfig
@@ -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
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 3a5bf5e..3a81fd6 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -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
diff --git a/configs/io64_defconfig b/configs/io64_defconfig
index 6215c77..87ef11e 100644
--- a/configs/io64_defconfig
+++ b/configs/io64_defconfig
@@ -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
diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig
index 54b873f..0042d3f 100644
--- a/configs/ipek01_defconfig
+++ b/configs/ipek01_defconfig
@@ -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
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index af913ac..36b08b5 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -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
diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig
index 4827934..b73a2de 100644
--- a/configs/kc1_defconfig
+++ b/configs/kc1_defconfig
@@ -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 # "
diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig
index f740b0b..a497408 100644
--- a/configs/kilauea_defconfig
+++ b/configs/kilauea_defconfig
@@ -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
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
index 2df48c2..746eba6 100644
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -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
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index 7951f65..74d5f86 100644
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig
index e75297e..808a981 100644
--- a/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index a54cfc6..ce53a4c 100644
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
index 84ab1bd..21c8705 100644
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index 074d18e..88344ba 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -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
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig
index ad40e12..f4efb45 100644
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -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
diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig
index 6812bfb..7a35354 100644
--- a/configs/ls1021aqds_sdcard_ifc_defconfig
+++ b/configs/ls1021aqds_sdcard_ifc_defconfig
@@ -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
diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig
index e226071..f8a3d50 100644
--- a/configs/ls1021aqds_sdcard_qspi_defconfig
+++ b/configs/ls1021aqds_sdcard_qspi_defconfig
@@ -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
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index e5a0eca..fdbcbf0 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig
index 43ba7fe..dce1592 100644
--- a/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@ -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
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
index 8cfaeaf..cd37246 100644
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -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
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index 4762425..07f7023 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -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
diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
index 25760e4..ab1a558 100644
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig
index 5f9efdf..52dc6f0 100644
--- a/configs/ls1021atwr_sdcard_ifc_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_defconfig
@@ -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
diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig
index e272ea7..6e7289e 100644
--- a/configs/ls1021atwr_sdcard_qspi_defconfig
+++ b/configs/ls1021atwr_sdcard_qspi_defconfig
@@ -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
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 5393084..834d822 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -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
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index 48bacaa..fb7d90f 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -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
diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig
index b6a0bef..609a218 100644
--- a/configs/lwmon5_defconfig
+++ b/configs/lwmon5_defconfig
@@ -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
diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index 2bfed59..2707b39 100644
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -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
diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index 03a4bfd..bce58ff 100644
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -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
diff --git a/configs/makalu_defconfig b/configs/makalu_defconfig
index bb9ee2f..3e45de5 100644
--- a/configs/makalu_defconfig
+++ b/configs/makalu_defconfig
@@ -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
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index dd94d22..a31d213 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -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
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index 28837f9..f9510a8 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -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 # "
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index cf6c4b1..60c8569 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -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
diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig
index 557fdfc..990a93a 100644
--- a/configs/miniarm-rk3288_defconfig
+++ b/configs/miniarm-rk3288_defconfig
@@ -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
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 3d3a30d..51d86f4 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -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
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 0fdec87..1c9d1b0 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -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 => "
diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig
index 8db7064..e70eaf7 100644
--- a/configs/mx23evk_defconfig
+++ b/configs/mx23evk_defconfig
@@ -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
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index f833edc..0c6a01c 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -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
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 1ab2747..a2da3b8 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -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
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index af35c49..8ec6026 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -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
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 02a50bf..63a3270 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -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
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index c903b41..d68d001 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -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
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index b75ba01..0bd4f26 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -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
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 27c3d3b..6edc8b7 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -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
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index f9fda50..be8739f 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -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
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index dc28694..f6c702a 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -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
diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
index c34d834..d46cca1 100644
--- a/configs/mx6qpsabreauto_defconfig
+++ b/configs/mx6qpsabreauto_defconfig
@@ -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
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index bf4c465..7de4166 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -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
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 4b42d08..7e592c5 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -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
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index d1385c7..b502299 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -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
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index e9edba6..9cfeae9 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -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
diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index c9bd1f0..96209e5 100644
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -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
diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig
index d013cb0..8fdd0cf 100644
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -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
diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig
index a829a18..f878970 100644
--- a/configs/mx6ul_14x14_evk_defconfig
+++ b/configs/mx6ul_14x14_evk_defconfig
@@ -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
diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig
index eaf3cfd..4b5b41a 100644
--- a/configs/mx6ul_9x9_evk_defconfig
+++ b/configs/mx6ul_9x9_evk_defconfig
@@ -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
diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 3203551..e7a72fe 100644
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -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
diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig
index cf12cef..5a6657c 100644
--- a/configs/mx7dsabresd_secure_defconfig
+++ b/configs/mx7dsabresd_secure_defconfig
@@ -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
diff --git a/configs/nanopi_neo_defconfig b/configs/nanopi_neo_defconfig
index 5adf1ff..5164245 100644
--- a/configs/nanopi_neo_defconfig
+++ b/configs/nanopi_neo_defconfig
@@ -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
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 122ed7a..e65e02d 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -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
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 0547aa6..add64ab 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -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
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index e72815d..f476137 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -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
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 1422787..9dd88d6 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -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
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 6373255..c16b3d8 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -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
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 849772f..d4d78b9 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -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
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 4a62c56..1dd8466 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -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
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 68cdb89..b738812 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -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
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index a380502..1012ca2 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -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
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 3c7b903..f0f310c 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -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
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 590bb27..ac0c3d1 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -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
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index da10392..9db8b86 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -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
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 1ffdddc..dd6e8c4 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -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
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index eabf22a..1b67495 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -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
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 76d0968..29f40af 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -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
diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
index e101614..c749588 100644
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@@ -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 # "
diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig
index e92d9c6..3f255ea 100644
--- a/configs/omap3_zoom1_defconfig
+++ b/configs/omap3_zoom1_defconfig
@@ -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
diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index e496afe..43283c2 100644
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -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
diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig
index ea62104..37461f9 100644
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -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
diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig
index 2207b81..4727aca 100644
--- a/configs/orangepi_2_defconfig
+++ b/configs/orangepi_2_defconfig
@@ -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
diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig
index a72d506..8545835 100644
--- a/configs/orangepi_lite_defconfig
+++ b/configs/orangepi_lite_defconfig
@@ -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
diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
index 5a7aba1..01b4ece 100644
--- a/configs/orangepi_one_defconfig
+++ b/configs/orangepi_one_defconfig
@@ -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
diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig
index 3f8010c..910d68e 100644
--- a/configs/orangepi_pc_defconfig
+++ b/configs/orangepi_pc_defconfig
@@ -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
diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig
index f8f6dab..f43682b 100644
--- a/configs/orangepi_pc_plus_defconfig
+++ b/configs/orangepi_pc_plus_defconfig
@@ -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
diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig
index cfae5f0..df05d37 100644
--- a/configs/orangepi_plus2e_defconfig
+++ b/configs/orangepi_plus2e_defconfig
@@ -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
diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
index 6c99aa2..bf88fef 100644
--- a/configs/orangepi_plus_defconfig
+++ b/configs/orangepi_plus_defconfig
@@ -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
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index d667b0f..9a09d43 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -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 # "
diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index 69fc1ba..e62f213 100644
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -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
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 6ccd7a3..0a30c04 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -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
diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index 1fd4649..caefc3e 100644
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -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
diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
index 4c4606a..9ffb244 100644
--- a/configs/p2771-0000-000_defconfig
+++ b/configs/p2771-0000-000_defconfig
@@ -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
diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig
index b32df1c..4dbc46e 100644
--- a/configs/p2771-0000-500_defconfig
+++ b/configs/p2771-0000-500_defconfig
@@ -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
diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig
index 2536ca7..a3a4f5d 100644
--- a/configs/picosam9g45_defconfig
+++ b/configs/picosam9g45_defconfig
@@ -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> "
diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig
index 6f82190..348cbd4 100644
--- a/configs/pine64_plus_defconfig
+++ b/configs/pine64_plus_defconfig
@@ -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
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index b1997fe..72126ef 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -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
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index 361e9bb..63637e7 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -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
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index f9f56d2..7ffde4b 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -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
diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index d7f60a1..2c15d87 100644
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -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
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 769adf6..653dff6 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -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
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index 75e7203..101a8ce 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -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
diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index 4bcd0dc..d8bd703 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -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
diff --git a/configs/rainier_defconfig b/configs/rainier_defconfig
index c0e647e..744ef2d 100644
--- a/configs/rainier_defconfig
+++ b/configs/rainier_defconfig
@@ -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
diff --git a/configs/rainier_ramboot_defconfig b/configs/rainier_ramboot_defconfig
index 7030fe4..8c85258 100644
--- a/configs/rainier_ramboot_defconfig
+++ b/configs/rainier_ramboot_defconfig
@@ -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
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index 652b13f..e9e5191 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -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
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index bda4e95..69d208d 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -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
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index 8e2c410..0e408d2 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -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
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index b7354eb..6ad4189 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -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
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index ea39231..ac1f38e 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -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
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index cacc443..4cbf022 100644
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -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
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 1f14566..e956e7c 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -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
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
index ccc0b19..8cee4c2 100644
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -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
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
index 2ed8a33..8dc5e24 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -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
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
index 81be7f5..019869c 100644
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -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
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
index e7398dd..f9c766a 100644
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -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
diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig
index e4032f9..c8456d0 100644
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -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
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig
index 903ddcb..a061c4d 100644
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -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
diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
index de07139..4ede451 100644
--- a/configs/sansa_fuze_plus_defconfig
+++ b/configs/sansa_fuze_plus_defconfig
@@ -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
diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig
index 9bdab0b..5304bf4 100644
--- a/configs/sequoia_defconfig
+++ b/configs/sequoia_defconfig
@@ -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
diff --git a/configs/sequoia_ramboot_defconfig b/configs/sequoia_ramboot_defconfig
index 65ae39a..2a8193d 100644
--- a/configs/sequoia_ramboot_defconfig
+++ b/configs/sequoia_ramboot_defconfig
@@ -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
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index de62cb3..4189475 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -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 # "
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 04521f2..8715ec3 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -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 # "
diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
index a44082e..02b51c4 100644
--- a/configs/sniper_defconfig
+++ b/configs/sniper_defconfig
@@ -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 # "
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index d8611bd..6fd0354 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -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
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index 42b71c3..c345faf 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -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
diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
index f38e376..e880e01 100644
--- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig
@@ -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
diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig
index c3217f2..671423a 100644
--- a/configs/socfpga_is1_defconfig
+++ b/configs/socfpga_is1_defconfig
@@ -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
diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig
index 4041b68..13903f7 100644
--- a/configs/socfpga_mcvevk_defconfig
+++ b/configs/socfpga_mcvevk_defconfig
@@ -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
diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig
index 58dc5b0..920084d 100644
--- a/configs/socfpga_sockit_defconfig
+++ b/configs/socfpga_sockit_defconfig
@@ -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
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index 42af4ba..0894cce 100644
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -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
diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
index 814b111..9db5493 100644
--- a/configs/socfpga_sr1500_defconfig
+++ b/configs/socfpga_sr1500_defconfig
@@ -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
diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index d83f1e5..faa05e5 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -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
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index 75db38f..fd79510 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -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
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 4cfaeda..21deb94 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -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
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 0871408..7e3d84f 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -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
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 9441b17..f43652a 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -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
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index cea91b6..27168e6 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -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
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index 59b73ca..e226abf 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -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
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 2773654..66c00a9 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -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
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 201a870..3b91e0d 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -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
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 358fc8f..72575ca 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -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
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 5a91de4..345a25b 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -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
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index 33aa977..8e16a92 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -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
diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
index 9f0c378..55b1442 100644
--- a/configs/xfi3_defconfig
+++ b/configs/xfi3_defconfig
@@ -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
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 8710307..311e52a 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -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
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 92c69e5..458c3b0 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -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}
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 4276f65..059456f 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -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}
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index a61e25c..a448e1f 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -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}
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index bf75209..b006e31 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -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
*************************************************************/
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index ab8993b..9dca8c7 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -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}
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index ebabdff..c8d0a58 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -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 */
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 7d08f0c..d6c38c7 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -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
*************************************************************/
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 956c787..aceddc4 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -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
/*-----------------------------------------------------------------------
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index eb3cfc0..6934e65 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -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 */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 0d6051e..c363719 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -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 */
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index d64611a..5f25d55 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -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
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index e115bdd..8e2f299 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -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 */
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 814b879..19703cd 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -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 */
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index cc211c5..8bb13ec 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -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
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 992948a..22410ce 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -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
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 698c924..fdfbb55 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -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
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index d6d9838..a0e9076 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -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
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 867bd69..591c7d4 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -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 */
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 854caf3..ecc87ea 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -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
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 9968b14..e89c19b 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -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
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index c3d07a1..a54e59e 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -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
/*
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index a383de6..1bbfb9e 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -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
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index edad1dd..209e6e6 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -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
/*
diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index 85510f0..277f36e 100644
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -41,7 +41,6 @@
#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
/* As stated above, the following choices are optional. */
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 5ee83de..6c3d98b 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -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
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 46584fd..4e08846 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -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
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index e4c9358..0cd2f3c 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -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 */
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index a408fbf..893d637 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -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
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index e911303..5ecec01 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -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
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index fbe9c82..37972a8 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -340,8 +340,6 @@
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
/*
* Command line configuration.
*/
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index c1abcb6..78eb567 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -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
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 8cf0283..c2ad92d 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -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 */
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 23c173e..68ce795 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -77,8 +77,6 @@
/*
* Console configuration
*/
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
/*
* Display cpu info@boot
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index f49284c..6054f88 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -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
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 809ec21..87f16d9 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -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
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 111b23d..12ceb2c 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -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
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index 907b5ea..e8c0eaf 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -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)
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 52f096e..435b0ca 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -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 */
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index ae6539c..c17c5e9 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -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
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index f01a74a..f2b35fa 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -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
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 3e419c6..8e77982 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -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 */
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 50dfc11..614e2ad 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -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
diff --git a/include/configs/io64.h b/include/configs/io64.h
index 894da84..7f2cbd5 100644
--- a/include/configs/io64.h
+++ b/include/configs/io64.h
@@ -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
*----------------------------------------------------------------------*/
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 126e02e..16eee33 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -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
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 32be528..61fcab2 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -135,8 +135,6 @@
* Console
*/
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index 227504f..9741398 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -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
*----------------------------------------------------------------------*/
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index bd6c83e..3e670e6 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -145,8 +145,6 @@
/*
* Console configuration
*/
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
/*
* Environment variables configurations
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index a29073c..cf7d5cb 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -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
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index d3ef614..d05141a 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -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
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index baa35db..6084c8e 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -36,7 +36,6 @@
#define CONFIG_KIRKWOOD_GPIO
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_CONSOLE_INFO_QUIET
/*
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 7b88ad5..d8398ee 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -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
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 5af55d8..d7c4146 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -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
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index b156e42..8fe5db6 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -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
/*
diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index dcfe3d7..dea340d 100644
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -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
*----------------------------------------------------------------------*/
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index b6a710f..428fe58 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -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 */
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index a07bcc6..b11afb9 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -256,8 +256,6 @@
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
/* Enable flat device tree support */
#define CONFIG_LMB 1
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 29564d7..5f44d5f 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -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"
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 072aafd..7a3f1f3 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -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
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index d259f53..69245f1 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -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
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 237ef04..d48fcc2 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -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
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 7423cff..3276940 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -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
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 4c61999..70f2162 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -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
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 925a418..37bd13e 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -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
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 83f3d95..b58e6c7 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -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
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index d15dd5f..634556d 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -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 */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 6ad4a3e..c66a936 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -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
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 41ebd6d..5a2d419 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -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 */
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 8cb0282..cba0604 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -164,14 +164,12 @@
#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_SPLASH_SCREEN
#define CONFIG_BMP_16BPP
#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
#endif
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index a28244d..704d1e7 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -44,7 +44,6 @@
/* Console configuration */
#define CONFIG_SYS_CONSOLE_INFO_QUIET
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_BOOTARGS "Please use defined boot"
#define CONFIG_BOOTCOMMAND "run autoboot"
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 740b588..4cdf178 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -244,7 +244,6 @@
/* USB device configuration */
#define CONFIG_USB_DEVICE
#define CONFIG_USB_TTY
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
/* Change these to suit your needs */
#define CONFIG_USBD_VENDORID 0x0451
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 9ca648d..a54575a 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -65,7 +65,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
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index fce50f5..25c6077 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -29,7 +29,6 @@
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
#define CONFIG_SYS_DEVICE_NULLDEV 1
/*
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 6397051..8c056e9 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -55,7 +55,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
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 0f76d32..a075b54 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -38,7 +38,6 @@
/* Console configuration */
#define CONFIG_SYS_CONSOLE_INFO_QUIET
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 206bfa7..8ebf336 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -53,7 +53,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 0x23E00000
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 537a6d8..fbb7146 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -160,7 +160,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
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 9993248..a4672b0 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -173,7 +173,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
#define CONFIG_LCD_IN_PSRAM 1
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 7ac3a5e..d033866 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -39,11 +39,6 @@
#define CONFIG_SPL_STACK 0xff718000
#define CONFIG_SPL_TEXT_BASE 0xff704004
-#ifndef CONFIG_SPL_BUILD
-# define CONFIG_SYS_CONSOLE_IS_IN_ENV
-# define CONFIG_CONSOLE_MUX
-#endif
-
/* MMC/SD IP block */
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 8d4ad5d..decf35a 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -130,8 +130,6 @@
#define CONFIG_FAT_WRITE
#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_SYS_LOAD_ADDR 0x1000000
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_PREBOOT "usb start"
/* Shell */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 72286dd..87d169a 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -135,7 +135,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 9915306..e2d814f 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -30,7 +30,6 @@
/* Console configuration */
#define CONFIG_SYS_CONSOLE_INFO_QUIET
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_BOOTARGS "Please use defined boot"
#define CONFIG_BOOTCOMMAND "run mmcboot"
diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index e684d2a..c20d6f9 100644
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -97,7 +97,6 @@
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_ATMEL_HLCD
#define CONFIG_ATMEL_LCD_RGB565
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#endif
#ifdef CONFIG_SYS_USE_MMC
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 8b73a1b..c149e5b 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -48,7 +48,6 @@
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_ATMEL_HLCD
#define CONFIG_ATMEL_LCD_RGB565
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
/* board specific (not enough SRAM) */
#define CONFIG_SAMA5D3_LCD_BASE 0x23E00000
diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index c90e1e6..0890cf5 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -104,7 +104,6 @@
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_ATMEL_HLCD
#define CONFIG_ATMEL_LCD_RGB565
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#endif
#ifdef CONFIG_SYS_USE_SERIALFLASH
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index b9927e9..36da48c 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -103,7 +103,6 @@
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_ATMEL_HLCD
#define CONFIG_ATMEL_LCD_RGB565
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#ifdef CONFIG_SYS_USE_SERIALFLASH
/* override the bootcmd, bootargs and other configuration for spi flash env*/
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index bd005fc..b6533c3 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -149,8 +149,6 @@
/* LCD and keyboard require SDL support */
#ifdef CONFIG_SANDBOX_SDL
#define CONFIG_CMD_BMP
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define LCD_BPP LCD_COLOR16
#define CONFIG_LCD_BMP_RLE8
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index ac783d3..1afe374 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -266,8 +266,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
/*
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index aab286f..6ccb31d 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -78,8 +78,6 @@
/* LCD */
#define CONFIG_ATMEL_LCD
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_GURNARD_SPLASH
#define CONFIG_ATMEL_SPI
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 3bc9819..3fe5983 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -146,8 +146,6 @@
* Console
*/
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index e1faf38..39dcd51 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -252,7 +252,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
/*
* U-Boot environment
*/
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#if !defined(CONFIG_ENV_SIZE)
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 29f9522..85cc457 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -179,7 +179,6 @@
#define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP
#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
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index c604ce2..e7cf038 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -298,7 +298,6 @@ extern int soft_i2c_gpio_scl;
#define VIDEO_LINE_LEN (pGD->plnSizeX)
/* allow both serial and cfb console. */
-#define CONFIG_CONSOLE_MUX
/* stop x86 thinking in cfbconsole from trying to init a pc keyboard */
#define CONFIG_VGA_AS_SINGLE_DEVICE
@@ -352,7 +351,6 @@ extern int soft_i2c_gpio_scl;
#endif
#ifdef CONFIG_USB_KEYBOARD
-#define CONFIG_CONSOLE_MUX
#define CONFIG_PREBOOT
#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
@@ -366,7 +364,6 @@ extern int soft_i2c_gpio_scl;
#endif
#define CONFIG_MISC_INIT_R
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#ifndef CONFIG_SPL_BUILD
#include <config_distro_defaults.h>
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index ddd53dd..d470e04 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -46,8 +46,6 @@
#define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_CONSOLE_MUX
#define CONFIG_CONS_INDEX 1
/* *** Command definition *** */
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 1385d31..78024af 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -66,8 +66,6 @@
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#ifndef CONFIG_SPL_BUILD
#define CONFIG_SYS_STDIO_DEREGISTER
#endif
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 4115c78..52c0563 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -75,7 +75,6 @@
/* USB device configuration */
#define CONFIG_USB_DEVICE 1
#define CONFIG_USB_TTY 1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
/*
* Environment setup
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 22b0c90..9fc6513 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -42,7 +42,6 @@
/* Console configuration */
#define CONFIG_SYS_CONSOLE_INFO_QUIET
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
/* MACH_TYPE_TRATS macro will be removed once added to mach-types */
#define MACH_TYPE_TRATS 3928
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 1febaae..c437c13 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -39,7 +39,6 @@
/* Console configuration */
#define CONFIG_SYS_CONSOLE_INFO_QUIET
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_BOOTARGS "Please use defined boot"
#define CONFIG_BOOTCOMMAND "run autoboot"
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 69d0fd5..1b99719 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -78,7 +78,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
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 74b2522..42c8f0a 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -62,8 +62,6 @@
9600, 19200, 38400, 115200}
#define CONFIG_SYS_NS16550_PORT_MAPPED
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_CMDLINE_EDITING
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7a69be5..5e2f8ce 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -678,7 +678,6 @@ CONFIG_CONSOLE
CONFIG_CONSOLE_DEV
CONFIG_CONSOLE_EXTRA_INFO
CONFIG_CONSOLE_INFO_QUIET
-CONFIG_CONSOLE_MUX
CONFIG_CONSOLE_SCROLL_LINES
CONFIG_CONS_EXTC_PINSEL
CONFIG_CONS_EXTC_RATE
@@ -4623,7 +4622,6 @@ CONFIG_SYS_CONSOLE_BG_COL
CONFIG_SYS_CONSOLE_ENV_OVERWRITE
CONFIG_SYS_CONSOLE_FG_COL
CONFIG_SYS_CONSOLE_INFO_QUIET
-CONFIG_SYS_CONSOLE_IS_IN_ENV
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
CONFIG_SYS_CORE_SRAM
CONFIG_SYS_CORE_SRAM_SIZE
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 05/29] config: Drop CONFIG_CONSOLE
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (3 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 04/29] Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 4:44 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 06/29] config: Drop CONFIG_CONSOLE_DEV Simon Glass
` (24 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This is not really a config. Rename it to avoid confusion.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
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(-)
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 177718e..0fbc1fd 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -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; " \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5e2f8ce..d66282a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 06/29] config: Drop CONFIG_CONSOLE_DEV
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (4 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 05/29] config: Drop CONFIG_CONSOLE Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 4:46 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 07/29] Convert CONFIG_VIDEO to Kconfig Simon Glass
` (23 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This is not really a config. Rename it to avoid confusion.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
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(-)
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 22410ce..4f07f23 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -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" \
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index a0e9076..3401f66 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -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" \
diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index be93deb..1799cc1 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -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
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 152f5e9..8fa3eb5 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -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
diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h
index 78791db..df9b5c9 100644
--- a/include/configs/aristainetos2b.h
+++ b/include/configs/aristainetos2b.h
@@ -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
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 6c3d98b..8090200 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -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" \
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 81b79b2..7e9bcb1 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -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" \
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 87f16d9..6266d95 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -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)
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 435b0ca..cf805b3 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -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" \
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index d48fcc2..6e4a4f8 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -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=" \
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index 9cf3c2c..f849f34 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -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 */
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 3276940..32ebb51 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -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" \
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 5c2734d..789c407 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -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 */
diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
index 8913784..e9cf190 100644
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -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" \
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index c36245b..2869c4e 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -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)
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 029eddd..983153f 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -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" \
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index 2f52598..3cae4fe 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -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 */
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 8896bc3..3e88391 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -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
diff --git a/include/configs/zc5202.h b/include/configs/zc5202.h
index 073a42c..8e75c40 100644
--- a/include/configs/zc5202.h
+++ b/include/configs/zc5202.h
@@ -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"
diff --git a/include/configs/zc5601.h b/include/configs/zc5601.h
index 28b9c6b..6ede668 100644
--- a/include/configs/zc5601.h
+++ b/include/configs/zc5601.h
@@ -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"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d66282a..56a8354 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 07/29] Convert CONFIG_VIDEO to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (5 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 06/29] config: Drop CONFIG_CONSOLE_DEV Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 4:47 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 08/29] Convert CONFIG_CFB_CONSOLE " Simon Glass
` (22 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_VIDEO
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
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(-)
diff --git a/README b/README
index 638f1e3..c222663 100644
--- a/README
+++ b/README
@@ -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
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 0f4f12f..3adc776 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -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
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index b749a41..740d4e5 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -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
diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig
index 27d5826..e6a73ab 100644
--- a/configs/MPC8536DS_36BIT_defconfig
+++ b/configs/MPC8536DS_36BIT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_PHYS_64BIT=y
diff --git a/configs/MPC8536DS_SDCARD_defconfig b/configs/MPC8536DS_SDCARD_defconfig
index eaeacca..78b11d6 100644
--- a/configs/MPC8536DS_SDCARD_defconfig
+++ b/configs/MPC8536DS_SDCARD_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8536DS_SPIFLASH_defconfig b/configs/MPC8536DS_SPIFLASH_defconfig
index 525ccad..f161b61 100644
--- a/configs/MPC8536DS_SPIFLASH_defconfig
+++ b/configs/MPC8536DS_SPIFLASH_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig
index 0ff061b..aebf39d 100644
--- a/configs/MPC8536DS_defconfig
+++ b/configs/MPC8536DS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index 13bbe84..d337b7a 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8544DS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
index ec57018..1f17fa0 100644
--- a/configs/MPC8572DS_36BIT_defconfig
+++ b/configs/MPC8572DS_36BIT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8572DS=y
CONFIG_PHYS_64BIT=y
diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
index 0639b4f..0b744df 100644
--- a/configs/MPC8572DS_defconfig
+++ b/configs/MPC8572DS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8572DS=y
CONFIG_FIT=y
diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
index 10607e8..2c03ba2 100644
--- a/configs/MPC8610HPCD_defconfig
+++ b/configs/MPC8610HPCD_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC86xx=y
CONFIG_TARGET_MPC8610HPCD=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
index 2292360..0c3d60b 100644
--- a/configs/MPC8641HPCN_36BIT_defconfig
+++ b/configs/MPC8641HPCN_36BIT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC86xx=y
CONFIG_TARGET_MPC8641HPCN=y
CONFIG_PHYS_64BIT=y
diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
index d8f74b3..d2250ec 100644
--- a/configs/MPC8641HPCN_defconfig
+++ b/configs/MPC8641HPCN_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC86xx=y
CONFIG_TARGET_MPC8641HPCN=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig
index aec6b9a..31602ab 100644
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 02c9c1b..7f46376 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -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
diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
index 93637e4..c46576d 100644
--- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
# CONFIG_SYS_MALLOC_F is not set
diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig
index ac419b4..7c1a07a 100644
--- a/configs/T1024QDS_DDR4_defconfig
+++ b/configs/T1024QDS_DDR4_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
CONFIG_FIT=y
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index 6ed4e9e..4069fa6 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -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
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index 243b2b1..901668d 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -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
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index e3a249f..c38aa6b 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
# CONFIG_SYS_MALLOC_F is not set
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index 8a8b854..8b8dddd 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index b5c6c1e..fac904e 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
CONFIG_FIT=y
diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig
index 8526426..7e336e7 100644
--- a/configs/T1040QDS_DDR4_defconfig
+++ b/configs/T1040QDS_DDR4_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T1040QDS=y
CONFIG_FIT=y
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index 6dee606..65fa78b 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T1040QDS=y
# CONFIG_SYS_MALLOC_F is not set
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index 716490b..8fbb287 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T1040QDS=y
CONFIG_FIT=y
diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index ce34ec1..e40fe49 100644
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index 63e88df..2665b05 100644
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
index 9035ab9..1d2548b 100644
--- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
# CONFIG_SYS_MALLOC_F is not set
diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index b26304c..611881f 100644
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
index ff39f15..7f172cd 100644
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_FIT=y
diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
index 3e4e9e2..c80db93 100644
--- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index 5fd9c1e..cebe3c9 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index 95a4c8a..433c856 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index f05e33c..6c3ba81 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -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
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index 07faad5..8932572 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_FIT=y
diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig
index 353fdc1..cdba626 100644
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig
index ec3655d..ddd356b 100644
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig
index 823e2ae..541a37a 100644
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig
index c47ff76..1d31439 100644
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 2f1e4da..b7443d9 100644
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -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
diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
index 708bc24..d365606 100644
--- a/configs/aristainetos2b_defconfig
+++ b/configs/aristainetos2b_defconfig
@@ -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
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index de00afd..a1d2c4e 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -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
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index fd4d9fb..aa4bfe0 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_VIDEO=y
CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="bayleybay"
CONFIG_TARGET_BAYLEYBAY=y
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index f1ee51d..85080b6 100644
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -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
diff --git a/configs/charon_defconfig b/configs/charon_defconfig
index 8517f2b..a7e60b7 100644
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_CHARON=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 9d8f6fb..39b4f73 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -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
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index cc68c6a..4e24d60 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -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
diff --git a/configs/cm-bf548_defconfig b/configs/cm-bf548_defconfig
index bcf6d8f..f749392 100644
--- a/configs/cm-bf548_defconfig
+++ b/configs/cm-bf548_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
+# CONFIG_VIDEO is not set
CONFIG_TARGET_CM_BF548=y
CONFIG_BOOTDELAY=5
CONFIG_SILENT_CONSOLE=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 12b75ae..2c2715f 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -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
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 1f7525b..faf25ca 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -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
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index d8a7d42..e869bff 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -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"
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 1bd53fc..bbad68e 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -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"
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index cdd466a..91c15a6 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -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
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index 28951e0..203a043 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -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
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index c2294c5..693302c 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_VIDEO=y
CONFIG_VENDOR_COREBOOT=y
CONFIG_TARGET_COREBOOT=y
CONFIG_FIT=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 838d86c..5d90bd2 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_VIDEO=y
CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="crownbay"
CONFIG_TARGET_CROWNBAY=y
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 0cf60eb..3ae2aa5 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -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
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig
index 2494412..695f5bb 100644
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig
index 1f4c15c..2fae7a4 100644
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
index 8d77864..a0541d1 100644
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig
index 56e14e1..c66328d 100644
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index 5042a82..f0dcb1d 100644
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -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
diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index da741b4..468b3a7 100644
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -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
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 2b17a51..13411c6 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -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
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index bf9177b..daaa345 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -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"
diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 4f6de89..90e0094 100644
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -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"
diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index eda7a14..49fb0dc 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 6240290..678d803 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -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
diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index 6556fa6..565a337 100644
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_4xx=y
CONFIG_TARGET_ICON=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig
index a210abb..b43c81d 100644
--- a/configs/imx31_phycore_eet_defconfig
+++ b/configs/imx31_phycore_eet_defconfig
@@ -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
diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig
index 0042d3f..ee36fab 100644
--- a/configs/ipek01_defconfig
+++ b/configs/ipek01_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_IPEK01=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
index 746eba6..465633a 100644
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -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
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index 74d5f86..14eafb9 100644
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig
index 808a981..a5918aa 100644
--- a/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index ce53a4c..24178ef 100644
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
index 21c8705..6cb0908 100644
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -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
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index 88344ba..5a70aed 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -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
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig
index f4efb45..49fadf8 100644
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -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
diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig
index 7a35354..55ff45f 100644
--- a/configs/ls1021aqds_sdcard_ifc_defconfig
+++ b/configs/ls1021aqds_sdcard_ifc_defconfig
@@ -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
diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig
index f8a3d50..bb61e11 100644
--- a/configs/ls1021aqds_sdcard_qspi_defconfig
+++ b/configs/ls1021aqds_sdcard_qspi_defconfig
@@ -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
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index fdbcbf0..8d2124f 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig
index dce1592..b076675 100644
--- a/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@ -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
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
index cd37246..7c9d4ef 100644
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -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
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index 07f7023..430fb5c 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -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
diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
index ab1a558..3685a54 100644
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig
index 52dc6f0..f7b4984 100644
--- a/configs/ls1021atwr_sdcard_ifc_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_defconfig
@@ -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
diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig
index 6e7289e..25f6741 100644
--- a/configs/ls1021atwr_sdcard_qspi_defconfig
+++ b/configs/ls1021atwr_sdcard_qspi_defconfig
@@ -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
diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig
index 609a218..a2259b4 100644
--- a/configs/lwmon5_defconfig
+++ b/configs/lwmon5_defconfig
@@ -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
diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index 2707b39..15677f6 100644
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -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
diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index bce58ff..aca7bc6 100644
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -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
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index a31d213..bc76dfd 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -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
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index f9510a8..18a9915 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -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
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 51d86f4..fc38642 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_VIDEO=y
CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="minnowmax"
CONFIG_TARGET_MINNOWMAX=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 1c9d1b0..4772a8c 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -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
diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig
index e70eaf7..6a2afd3 100644
--- a/configs/mx23evk_defconfig
+++ b/configs/mx23evk_defconfig
@@ -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
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index 0c6a01c..bd00eed 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -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
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index a2da3b8..7692c0c 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -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
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index 8ec6026..6e7655c 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -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
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 63a3270..04e9f4f 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -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
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index d68d001..02cbf57 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -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
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index 0bd4f26..f42758e 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -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
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 6edc8b7..59ae1a1 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -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
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index be8739f..68c1a6b 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -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
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index f6c702a..1dbfe53 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -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
diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
index d46cca1..1445b75 100644
--- a/configs/mx6qpsabreauto_defconfig
+++ b/configs/mx6qpsabreauto_defconfig
@@ -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
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 7de4166..004206b 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -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
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 7e592c5..3dab823 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -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
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index b502299..0f3cc7a 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -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
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index 9cfeae9..6d58495 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -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
diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index 96209e5..22993ca 100644
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -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
diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig
index 8fdd0cf..42d920a 100644
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -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
diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig
index f878970..9a29ff6 100644
--- a/configs/mx6ul_14x14_evk_defconfig
+++ b/configs/mx6ul_14x14_evk_defconfig
@@ -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
diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig
index 4b5b41a..8c5a0f3 100644
--- a/configs/mx6ul_9x9_evk_defconfig
+++ b/configs/mx6ul_9x9_evk_defconfig
@@ -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
diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index e7a72fe..a09fb3b 100644
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -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
diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig
index 5a6657c..7d85381 100644
--- a/configs/mx7dsabresd_secure_defconfig
+++ b/configs/mx7dsabresd_secure_defconfig
@@ -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
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index d4d78b9..d1be7b5 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -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
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 1dd8466..6212755 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -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
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index b738812..d05608e 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -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
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 1012ca2..452a16c 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -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
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index f0f310c..158df5d 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -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
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index ac0c3d1..fb8fa4c 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -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
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 9db8b86..43f0552 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -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
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index dd6e8c4..f0116f8 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -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
diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig
index 42f532b..8cb3461 100644
--- a/configs/pdm360ng_defconfig
+++ b/configs/pdm360ng_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC512X=y
CONFIG_TARGET_PDM360NG=y
CONFIG_FIT=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 8b9a890..d667c9b 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -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
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 653dff6..9bbbcd9 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
CONFIG_SMP=y
CONFIG_MAX_CPUS=2
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index 101a8ce..3dfc344 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
CONFIG_SMP=y
CONFIG_MAX_CPUS=2
diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index d8bd703..87afb73 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
CONFIG_SMP=y
CONFIG_MAX_CPUS=2
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index e9e5191..9ad02e4 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -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
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 1cf5a5f..56ba5e8 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -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
diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
index 4ede451..97a8bbf 100644
--- a/configs/sansa_fuze_plus_defconfig
+++ b/configs/sansa_fuze_plus_defconfig
@@ -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
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index fd79510..372918f 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_SOCRATES=y
CONFIG_FIT=y
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 21deb94..355f97f 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -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"
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 7e3d84f..0194c0c 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -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
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 27168e6..b110798 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -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
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index ec6a8f1..2596d78 100644
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -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
diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig
index ecba1ec..dc39c18 100644
--- a/configs/theadorable_defconfig
+++ b/configs/theadorable_defconfig
@@ -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
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 345a25b..329d5e4 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -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
diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
index 55b1442..3a34993 100644
--- a/configs/xfi3_defconfig
+++ b/configs/xfi3_defconfig
@@ -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
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 8361a71..bc246c5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -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
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index b006e31..e9101a0 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -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
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 3918160..5b638d9 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -504,7 +504,6 @@
/*#define VIDEO_IO_OFFSET CONFIG_SYS_PCI1_IO_VIRT*/
/* video */
-#define CONFIG_VIDEO
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index d8dda87..11ba6dd 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -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
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index e063c7a..26849fc 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -464,7 +464,6 @@
#define VIDEO_IO_OFFSET CONFIG_SYS_PCIE1_IO_VIRT
/* video */
-#define CONFIG_VIDEO
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index c1b9b6e..35fc2c9 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -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
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 1885124..fa5b180 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -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
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 41e3ee8..f7f1c4d 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -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
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index d6c38c7..8649cdb 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -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
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 6934e65..50e4046 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -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
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index c363719..5760db9 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -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
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 5f25d55..4f320ce 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -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
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 8e2f299..31b10ee 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -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
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 19703cd..ed2fccf 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -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
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 4f07f23..b771242 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -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
diff --git a/include/configs/aria.h b/include/configs/aria.h
index cb50658..f91e183 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -38,7 +38,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFF00000
/* video */
-#undef CONFIG_VIDEO
#if defined(CONFIG_VIDEO)
#define CONFIG_CFB_CONSOLE
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 3401f66..60f2bac 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -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
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index ddc4a25..d945b8d 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -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
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index c2466ca..ec4d93c 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -204,7 +204,6 @@
#endif
/* define to enable splash screen support */
-/* #define CONFIG_VIDEO */
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 811dae8..9376283 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -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
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 8090200..03cf96c 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -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
diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index d1aa262..c5b82f7 100644
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -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
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 4e08846..a1f11cb 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -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
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 5ecec01..ae0fe6e 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -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
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 37972a8..a952f62 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -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
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index 88845dc..ab87aa8 100644
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -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 */
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index c2ad92d..0a960ad 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -73,7 +73,6 @@
/*
* Video
*/
-#define CONFIG_VIDEO
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_MB862xx
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 6054f88..68f597e 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -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
/*
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 6d469a3..4a868c5 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -251,8 +251,6 @@
* VIDEO configuration
*/
-#define CONFIG_VIDEO
-
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_VCXK 1
diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h
index 95e46c5..7812870 100644
--- a/include/configs/efi-x86.h
+++ b/include/configs/efi-x86.h
@@ -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
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 6266d95..97a912b 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -117,7 +117,6 @@
#endif
/* Framebuffer */
-#define CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index 40f7fba..f4aceb9 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -32,7 +32,6 @@
#undef CONFIG_SCSI
/* Video is not supported in Quark SoC */
-#undef CONFIG_VIDEO
#undef CONFIG_CFB_CONSOLE
/* SD/MMC support */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index f2b35fa..a23f4c4 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -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
diff --git a/include/configs/icon.h b/include/configs/icon.h
index 7e9e7e6..7fc2da2 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -126,7 +126,6 @@
/*
* Video options
*/
-#define CONFIG_VIDEO
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_SM501
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 614e2ad..f39dd31 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -181,7 +181,6 @@
#define CONFIG_S6E63D6
-#define CONFIG_VIDEO
#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MX3
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 16eee33..42019a2 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -44,7 +44,6 @@
/*
* Video configuration for LIME GDC
*/
-#define CONFIG_VIDEO
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_MB862xx
#define CONFIG_VIDEO_MB862xx_ACCEL
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index cf7d5cb..141ecf2 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -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
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index d05141a..e20b645 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -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
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index d8398ee..00d0c19 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -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
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 4b95af3..a2accbf 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -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 */
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index d7c4146..e183ee8 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -33,7 +33,6 @@
#define CONFIG_CMD_NAND
#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_CMD_SATA
-#define CONFIG_VIDEO
/*
* Memory configurations
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 428fe58..480d3b5 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -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
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index e329105..719335a 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -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
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 5f44d5f..bb3da6f 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -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
diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 0de5737..208b6b8 100644
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -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 */
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 808736b..2d17b74 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -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 */
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 7a3f1f3..788740a 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -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
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 69245f1..a4c08f3 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -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
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 6e4a4f8..e658c52 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -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
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 32ebb51..dc7be11 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -208,7 +208,6 @@
#endif
/* Framebuffer */
-#define CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 70f2162..66bff1e 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -205,7 +205,6 @@
#endif
#ifndef CONFIG_SPL_BUILD
-#define CONFIG_VIDEO
#ifdef CONFIG_VIDEO
#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MXS
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 37bd13e..993be1a 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -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
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index b58e6c7..a7bf7f5 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -252,7 +252,6 @@
#define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_VIDEO
#ifdef CONFIG_VIDEO
#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MXS
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index c66a936..850d560 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -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
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 5a2d419..688265e 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -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
diff --git a/include/configs/novena.h b/include/configs/novena.h
index cba0604..7fcb2f8 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -24,7 +24,6 @@
#define CONFIG_FAT_WRITE
#define CONFIG_CMD_PCI
#define CONFIG_CMD_SATA
-#define CONFIG_VIDEO
/* U-Boot general configurations */
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index e0b4d36..af4baa8 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -39,7 +39,6 @@
#define CONFIG_SYS_DEVICE_NULLDEV
/* Video */
-#define CONFIG_VIDEO
#if defined(CONFIG_VIDEO)
#define CONFIG_CFB_CONSOLE
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 99a201c..541005c 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -124,7 +124,6 @@
#endif
#endif /* CONFIG_SPL_BUILD */
-#define CONFIG_VIDEO
#if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX
#define CONFIG_CFB_CONSOLE
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 5f62358..e19ed75 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -118,7 +118,6 @@
#undef CONFIG_HW_WATCHDOG
#endif
-#define CONFIG_VIDEO
#if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX
#define CONFIG_CFB_CONSOLE
diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
index d58b963..9fcca2c 100644
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -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 */
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 1afe374..7392fe3 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -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
/*
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 85cc457..18c496f 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -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
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index d470e04..6b1094b 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -71,7 +71,6 @@
#define CONFIG_PHY_ATHEROS
/* Framebuffer */
-#define CONFIG_VIDEO
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index d27ab9c..0c18dbf 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -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
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 1b99719..052742c 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -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
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 42c8f0a..7547c90 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -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
diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
index 69558fd..d780d67 100644
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -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 */
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 08/29] Convert CONFIG_CFB_CONSOLE to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (6 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 07/29] Convert CONFIG_VIDEO to Kconfig Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 4:48 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 09/29] Convert CONFIG_CFB_CONSOLE_ANSI " Simon Glass
` (21 subsequent siblings)
29 siblings, 2 replies; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_CFB_CONSOLE
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v3:
- Change CONFIG_CFB_CONSOLE to default y if CONFIG_VIDEO
Changes in v2: None
README | 39 ---------------------------------
configs/eb_cpu5282_defconfig | 1 +
configs/eb_cpu5282_internal_defconfig | 1 +
drivers/video/Kconfig | 41 +++++++++++++++++++++++++++++++++++
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/ac14xx.h | 1 -
include/configs/advantech_dms-ba16.h | 1 -
include/configs/aria.h | 1 -
include/configs/aristainetos-common.h | 1 -
include/configs/cgtqmx6eval.h | 1 -
include/configs/chromebook_samus.h | 2 --
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/efi-x86.h | 1 -
include/configs/embestmx6boards.h | 1 -
include/configs/galileo.h | 1 -
include/configs/ge_bx50v3.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/m53evk.h | 1 -
include/configs/mcx.h | 1 -
include/configs/mpc5121ads.h | 1 -
include/configs/mt_ventoux.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/mxs.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/sequoia.h | 1 -
include/configs/socrates.h | 1 -
include/configs/sunxi-common.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/theadorable.h | 1 -
include/configs/wandboard.h | 1 -
include/configs/x86-common.h | 1 -
scripts/config_whitelist.txt | 1 -
66 files changed, 43 insertions(+), 103 deletions(-)
diff --git a/README b/README
index c222663..18c5455 100644
--- a/README
+++ b/README
@@ -810,49 +810,10 @@ The following options need to be configured:
port routines must be defined elsewhere
(i.e. serial_init(), serial_getc(), ...)
- CONFIG_CFB_CONSOLE
- Enables console device for a color framebuffer. Needs following
- defines (cf. smiLynxEM, i8042)
- VIDEO_FB_LITTLE_ENDIAN graphic memory organisation
- (default big endian)
- VIDEO_HW_RECTFILL graphic chip supports
- rectangle fill
- (cf. smiLynxEM)
- VIDEO_HW_BITBLT graphic chip supports
- bit-blit (cf. smiLynxEM)
- VIDEO_VISIBLE_COLS visible pixel columns
- (cols=pitch)
- VIDEO_VISIBLE_ROWS visible pixel rows
- VIDEO_PIXEL_SIZE bytes per pixel
- VIDEO_DATA_FORMAT graphic data format
- (0-5, cf. cfb_console.c)
- VIDEO_FB_ADRS framebuffer address
- VIDEO_KBD_INIT_FCT keyboard int fct
- (i.e. rx51_kp_init())
- VIDEO_TSTC_FCT test char fct
- (i.e. rx51_kp_tstc)
- VIDEO_GETC_FCT get char fct
- (i.e. rx51_kp_getc)
- CONFIG_VIDEO_LOGO display Linux logo in
- upper left corner
- CONFIG_VIDEO_BMP_LOGO use bmp_logo.h instead of
- linux_logo.h for logo.
- Requires CONFIG_VIDEO_LOGO
- CONFIG_CONSOLE_EXTRA_INFO
- additional board info beside
- the logo
- CONFIG_HIDE_LOGO_VERSION
- do not display bootloader
- version string
-
When CONFIG_CFB_CONSOLE_ANSI is defined, console will support
a limited number of ANSI escape sequences (cursor control,
erase functions and limited graphics rendition control).
- When CONFIG_CFB_CONSOLE is defined, video console is
- default i/o. Serial console can be forced with
- environment 'console=serial'.
-
CONFIG_SYS_CONSOLE_BG_COL: define the backgroundcolor, default
is 0x00.
CONFIG_SYS_CONSOLE_FG_COL: define the foregroundcolor, default
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index daaa345..537d469 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -10,3 +10,4 @@ CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
+# CONFIG_CFB_CONSOLE is not set
diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 90e0094..e5f41f9 100644
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -9,3 +9,4 @@ CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
+# CONFIG_CFB_CONSOLE is not set
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index bc246c5..e6b8e9b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -422,4 +422,45 @@ config VIDEO
model. Video drivers typically provide a colour text console and
cursor.
+config CFB_CONSOLE
+ bool "Enable colour frame buffer console"
+ depends on VIDEO
+ default y if VIDEO
+ help
+ Enables the colour frame buffer driver. This supports colour
+ output on a bitmap display from an in-memory frame buffer.
+ Several colour devices are supported along with various options to
+ adjust the supported features. The driver is implemented in
+ cfb_console.c
+
+ The following defines are needed (cf. smiLynxEM, i8042)
+ VIDEO_FB_LITTLE_ENDIAN graphic memory organisation
+ (default big endian)
+ VIDEO_HW_RECTFILL graphic chip supports
+ rectangle fill (cf. smiLynxEM)
+ VIDEO_HW_BITBLT graphic chip supports
+ bit-blit (cf. smiLynxEM)
+ VIDEO_VISIBLE_COLS visible pixel columns (cols=pitch)
+ VIDEO_VISIBLE_ROWS visible pixel rows
+ VIDEO_PIXEL_SIZE bytes per pixel
+ VIDEO_DATA_FORMAT graphic data format
+ (0-5, cf. cfb_console.c)
+ VIDEO_FB_ADRS framebuffer address
+ VIDEO_KBD_INIT_FCT keyboard int fct (i.e. rx51_kp_init())
+ VIDEO_TSTC_FCT test char fct (i.e. rx51_kp_tstc)
+ VIDEO_GETC_FCT get char fct (i.e. rx51_kp_getc)
+ CONFIG_VIDEO_LOGO display Linux logo in upper left corner
+ CONFIG_VIDEO_BMP_LOGO use bmp_logo.h instead of linux_logo.h
+ for logo. Requires CONFIG_VIDEO_LOGO
+ CONFIG_CONSOLE_EXTRA_INFO
+ additional board info beside
+ the logo
+ CONFIG_HIDE_LOGO_VERSION
+ do not display bootloader
+ version string
+
+ When CONFIG_CFB_CONSOLE is defined, the video console is the
+ default console. The serial console can be forced by setting the
+ environment 'console=serial'.
+
endmenu
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index e9101a0..e9f0369 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -343,7 +343,6 @@
* Video support
************************************************************/
#define CONFIG_VIDEO_CT69000
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 5b638d9..e4fec53 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -507,7 +507,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_ATI_RADEON_FB
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 11ba6dd..23e8de4 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -280,7 +280,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_ATI_RADEON_FB
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 26849fc..1571c8a 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -467,7 +467,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_ATI_RADEON_FB
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 35fc2c9..699293c 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -26,7 +26,6 @@
#ifdef CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x2c000)
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index fa5b180..ce4e33f 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -380,7 +380,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_ATI_RADEON_FB
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index f7f1c4d..c4e3e65 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -381,7 +381,6 @@
#ifdef CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000)
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
@@ -404,7 +403,6 @@
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#endif
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 8649cdb..6110f28 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -303,7 +303,6 @@
* Video support
************************************************************/
#define CONFIG_VIDEO_CT69000
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 50e4046..d8a53bc 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -502,7 +502,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_DIU_CH7301
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 5760db9..d8792d6 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -500,7 +500,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 4f320ce..af63dd3 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -414,7 +414,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_DIU_CH7301
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 31b10ee..6480e4e 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -484,7 +484,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
#define CONFIG_FSL_DIU_CH7301
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_CFB_CONSOLE_ANSI
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index ed2fccf..9ecc363 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -100,7 +100,6 @@
#ifndef CONFIG_TQM5200S /* No graphics controller on TQM5200S */
#define CONFIG_VIDEO_SM501
#define CONFIG_VIDEO_SM501_32BPP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_LOGO
#ifndef CONFIG_FO300
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index 699ac41..f1013c4 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -33,7 +33,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFF00000
#if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#endif
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index b771242..840e3d9 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -276,7 +276,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/aria.h b/include/configs/aria.h
index f91e183..7b7e6e2 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -40,7 +40,6 @@
/* video */
#if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#endif
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 60f2bac..0ec5732 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -231,7 +231,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
/* check this console not needed, after test remove it */
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 03cf96c..1c76b5e 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -89,7 +89,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/chromebook_samus.h b/include/configs/chromebook_samus.h
index b89ba41..1234bff 100644
--- a/include/configs/chromebook_samus.h
+++ b/include/configs/chromebook_samus.h
@@ -16,8 +16,6 @@
#include <configs/x86-common.h>
#include <configs/x86-chromebook.h>
-#undef CONFIG_CFB_CONSOLE
-
#undef CONFIG_STD_DEVICES_SETTINGS
#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \
"stdout=vidconsole,serial\0" \
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index a1f11cb..55a5f93 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -256,7 +256,6 @@
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_SW_CURSOR
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index ae0fe6e..d523af8 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -224,7 +224,6 @@
#define DFU_DEFAULT_POLL_TIMEOUT 300
#ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index a952f62..47a3002 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -225,7 +225,6 @@
*/
#define CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000)
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CMD_BMP
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index ab87aa8..2ae42b7 100644
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -28,6 +28,5 @@
#define CONFIG_ENV_OFFSET 0x5ff000
/* Video is not supported for now */
-#undef CONFIG_CFB_CONSOLE
#endif /* __CONFIG_H */
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 0a960ad..b90554f 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -78,7 +78,6 @@
#define CONFIG_VIDEO_MB862xx
#define CONFIG_VIDEO_MB862xx_ACCEL
#define CONFIG_VIDEO_CORALP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_VIDEO_SW_CURSOR
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 68f597e..d3ca706 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -102,7 +102,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h
index 7812870..5626061 100644
--- a/include/configs/efi-x86.h
+++ b/include/configs/efi-x86.h
@@ -15,7 +15,6 @@
#undef CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_IS_NOWHERE
-#undef CONFIG_CFB_CONSOLE
#undef CONFIG_SCSI_AHCI
#undef CONFIG_SCSI
#undef CONFIG_INTEL_ICH6_GPIO
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 97a912b..e115fd5 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -118,7 +118,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index f4aceb9..beea0d8 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -32,7 +32,6 @@
#undef CONFIG_SCSI
/* Video is not supported in Quark SoC */
-#undef CONFIG_CFB_CONSOLE
/* SD/MMC support */
#define CONFIG_MMC
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index cf805b3..3baac67 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -307,7 +307,6 @@
/* Framebuffer */
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index a23f4c4..fa3a7286 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -181,7 +181,6 @@
/* Framebuffer and LCD */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_IPUV3_CLK 260000000
diff --git a/include/configs/icon.h b/include/configs/icon.h
index 7fc2da2..f858b99 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -132,7 +132,6 @@
#define CONFIG_VIDEO_SM501_32BPP
#define CONFIG_VIDEO_SM501_PCI
#define VIDEO_FB_LITTLE_ENDIAN
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index f39dd31..5a20437 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -181,7 +181,6 @@
#define CONFIG_S6E63D6
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MX3
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 42019a2..99200d1 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -48,7 +48,6 @@
#define CONFIG_VIDEO_MB862xx
#define CONFIG_VIDEO_MB862xx_ACCEL
#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 141ecf2..a19f206 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -451,7 +451,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_FSL_DCU_FB
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index e20b645..3c596f3 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -332,7 +332,6 @@
#ifdef CONFIG_FSL_DCU_FB
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 00d0c19..58446b5 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -355,7 +355,6 @@
/* Video console */
#define CONFIG_VIDEO_MB862xx
#define CONFIG_VIDEO_MB862xx_ACCEL
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
#define VIDEO_FB_16BPP_PIXEL_SWAP
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index e183ee8..3913fcd 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -201,7 +201,6 @@
*/
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_GZIP
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 480d3b5..25ab0c9 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -371,7 +371,6 @@
#define CONFIG_NET_RETRY_COUNT 10
#endif
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 719335a..ac3ac35 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -38,7 +38,6 @@
#ifdef CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR + 0x2100)
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index bb3da6f..3ec2358 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -51,7 +51,6 @@
#define CONFIG_FPGA_DELAY() udelay(1)
#define CONFIG_SYS_FPGA_PROG_FEEDBACK
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 788740a..4ecd7fd 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -97,7 +97,6 @@
/* Framebuffer and LCD */
#define CONFIG_PREBOOT
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index a4c08f3..89e5557 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -216,7 +216,6 @@
/* Framebuffer and LCD */
#define CONFIG_PREBOOT
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index e658c52..158858f 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -35,7 +35,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index dc7be11..fb380ba 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -209,7 +209,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 66bff1e..e288ad8 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -206,7 +206,6 @@
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 993be1a..c9ca034 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -229,7 +229,6 @@
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index a7bf7f5..da75d03 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -253,7 +253,6 @@
#define CONFIG_USB_FUNCTION_MASS_STORAGE
#ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 634556d..52083c8 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -143,7 +143,6 @@
/* LCD */
#ifdef CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 850d560..d18c177 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -93,7 +93,6 @@
/* Framebuffer and LCD */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 688265e..462bbe2 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -230,7 +230,6 @@
* Framebuffer
*/
/* Video console */
-#define CONFIG_CFB_CONSOLE
#define CONFIG_CFB_CONSOLE_ANSI /* Enable ANSI escape codes in framebuffer */
#define CONFIG_VIDEO_LOGO
#define VIDEO_FB_16BPP_PIXEL_SWAP
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 7fcb2f8..40194f0 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -161,7 +161,6 @@
/* Video output */
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index af4baa8..acadf72 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -41,7 +41,6 @@
/* Video */
#if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 541005c..ba14593 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -126,7 +126,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/rut.h b/include/configs/rut.h
index e19ed75..ca812e4 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -120,7 +120,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 7392fe3..facfdac 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -410,7 +410,6 @@
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
-#define CONFIG_CFB_CONSOLE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CMD_BMP
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 18c496f..5abdd23 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -171,7 +171,6 @@
#define CONFIG_VIDEO_MB862xx
#define CONFIG_VIDEO_MB862xx_ACCEL
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index e7cf038..78333c6 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -290,7 +290,6 @@ extern int soft_i2c_gpio_scl;
#define CONFIG_VIDEO_SUNXI
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_STD_TIMINGS
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 6b1094b..6ec1cc5 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -74,7 +74,6 @@
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_CFB_CONSOLE
#define CONFIG_CFB_CONSOLE_ANSI
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 0c18dbf..365019a 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -96,7 +96,6 @@
/* Enable LCD and reserve 512KB from top of memory*/
#define CONFIG_SYS_MEM_TOP_HIDE 0x80000
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CMD_BMP
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 052742c..aacf4ef 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -75,7 +75,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 7547c90..7633a43 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -132,7 +132,6 @@
#define CONFIG_VIDEO_SW_CURSOR
#define VIDEO_FB_16BPP_WORD_SWAP
#define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_CFB_CONSOLE
#define CONFIG_CONSOLE_SCROLL_LINES 5
/*-----------------------------------------------------------------------
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 56a8354..b6c1046 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -493,7 +493,6 @@ CONFIG_CDP_PORT_ID
CONFIG_CDP_POWER_CONSUMPTION
CONFIG_CDP_TRIGGER
CONFIG_CDP_VERSION
-CONFIG_CFB_CONSOLE
CONFIG_CFB_CONSOLE_ANSI
CONFIG_CFG_DATA_SECTOR
CONFIG_CFG_FAT
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 09/29] Convert CONFIG_CFB_CONSOLE_ANSI to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (7 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 08/29] Convert CONFIG_CFB_CONSOLE " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 4:50 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 10/29] Convert CONFIG_VIDEO_CT69000 " Simon Glass
` (20 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_CFB_CONSOLE_ANSI
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
README | 4 ----
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/nokia_rx51_defconfig | 1 +
configs/tbs2910_defconfig | 1 +
drivers/video/Kconfig | 9 +++++++++
include/configs/T104xRDB.h | 1 -
include/configs/nokia_rx51.h | 1 -
include/configs/tbs2910.h | 1 -
scripts/config_whitelist.txt | 1 -
18 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/README b/README
index 18c5455..62449bf 100644
--- a/README
+++ b/README
@@ -810,10 +810,6 @@ The following options need to be configured:
port routines must be defined elsewhere
(i.e. serial_init(), serial_getc(), ...)
- When CONFIG_CFB_CONSOLE_ANSI is defined, console will support
- a limited number of ANSI escape sequences (cursor control,
- erase functions and limited graphics rendition control).
-
CONFIG_SYS_CONSOLE_BG_COL: define the backgroundcolor, default
is 0x00.
CONFIG_SYS_CONSOLE_FG_COL: define the foregroundcolor, default
diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index e40fe49..a644929 100644
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -38,4 +38,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index 2665b05..ebd0990 100644
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -38,4 +38,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
index 1d2548b..54a8b5f 100644
--- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
@@ -31,6 +31,7 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index 611881f..a0920bb 100644
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -39,4 +39,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
index 7f172cd..35284df 100644
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -29,4 +29,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
index c80db93..e885816 100644
--- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
@@ -42,6 +42,7 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index cebe3c9..67ae007 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -38,4 +38,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index 433c856..87d2a29 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -38,4 +38,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index 6c3ba81..b28b46c 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -39,4 +39,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index 8932572..571e4e9 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -29,4 +29,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 43f0552..0599c19 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -22,3 +22,4 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
+CONFIG_CFB_CONSOLE_ANSI=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 0194c0c..8c342eb 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -38,4 +38,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="TBS"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e6b8e9b..bd57009 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -463,4 +463,13 @@ config CFB_CONSOLE
default console. The serial console can be forced by setting the
environment 'console=serial'.
+config CFB_CONSOLE_ANSI
+ bool "Support ANSI escape sequences"
+ depends on CFB_CONSOLE
+ help
+ This allows the colour buffer frame buffer driver to support
+ a limited number of ANSI escape sequences (cursor control,
+ erase functions and limited graphics rendition control). Normal
+ output from U-Boot will pass through this filter.
+
endmenu
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 6480e4e..cf59eb7 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -484,7 +484,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
#define CONFIG_FSL_DIU_CH7301
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
-#define CONFIG_CFB_CONSOLE_ANSI
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 462bbe2..c106ae3 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -230,7 +230,6 @@
* Framebuffer
*/
/* Video console */
-#define CONFIG_CFB_CONSOLE_ANSI /* Enable ANSI escape codes in framebuffer */
#define CONFIG_VIDEO_LOGO
#define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 6ec1cc5..340ae9c 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -74,7 +74,6 @@
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_CFB_CONSOLE_ANSI
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b6c1046..4669924 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -493,7 +493,6 @@ CONFIG_CDP_PORT_ID
CONFIG_CDP_POWER_CONSUMPTION
CONFIG_CDP_TRIGGER
CONFIG_CDP_VERSION
-CONFIG_CFB_CONSOLE_ANSI
CONFIG_CFG_DATA_SECTOR
CONFIG_CFG_FAT
CONFIG_CFG_USB
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 10/29] Convert CONFIG_VIDEO_CT69000 to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (8 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 09/29] Convert CONFIG_CFB_CONSOLE_ANSI " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:03 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 11/29] Convert CONFIG_SYS_CONSOLE_BG_COL et al " Simon Glass
` (19 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_VIDEO_CT69000
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
README | 23 -----------------------
configs/MIP405T_defconfig | 1 +
configs/MIP405_defconfig | 1 +
configs/PIP405_defconfig | 1 +
drivers/video/Kconfig | 27 +++++++++++++++++++++++++++
include/configs/MIP405.h | 1 -
include/configs/PIP405.h | 1 -
scripts/config_whitelist.txt | 1 -
8 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/README b/README
index 62449bf..9e72a82 100644
--- a/README
+++ b/README
@@ -1670,35 +1670,12 @@ CBFS (Coreboot Filesystem) support
instead.
- Video support:
- CONFIG_VIDEO_CT69000
-
- Enable Chips & Technologies 69000 Video chip
-
CONFIG_VIDEO_SMI_LYNXEM
Enable Silicon Motion SMI 712/710/810 Video chip. The
video output is selected via environment 'videoout'
(1 = LCD and 2 = CRT). If videoout is undefined, CRT is
assumed.
- For the CT69000 and SMI_LYNXEM drivers, videomode is
- selected via environment 'videomode'. Two different ways
- are possible:
- - "videomode=num" 'num' is a standard LiLo mode numbers.
- Following standard modes are supported (* is default):
-
- Colors 640x480 800x600 1024x768 1152x864 1280x1024
- -------------+---------------------------------------------
- 8 bits | 0x301* 0x303 0x305 0x161 0x307
- 15 bits | 0x310 0x313 0x316 0x162 0x319
- 16 bits | 0x311 0x314 0x317 0x163 0x31A
- 24 bits | 0x312 0x315 0x318 ? 0x31B
- -------------+---------------------------------------------
- (i.e. setenv videomode 317; saveenv; reset;)
-
- - "videomode=bootargs" all the video parameters are parsed
- from the bootargs. (See drivers/video/videomodes.c)
-
-
CONFIG_VIDEO_SED13806
Enable Epson SED13806 driver. This driver supports 8bpp
and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 3adc776..81e48dc 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -14,3 +14,4 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
+CONFIG_VIDEO_CT69000=y
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index 740d4e5..df0cd84 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -17,3 +17,4 @@ CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_VIDEO_CT69000=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 7f46376..4adddea 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -17,3 +17,4 @@ CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_VIDEO_CT69000=y
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index bd57009..34dcf65 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -472,4 +472,31 @@ config CFB_CONSOLE_ANSI
erase functions and limited graphics rendition control). Normal
output from U-Boot will pass through this filter.
+config VIDEO_CT69000
+ bool "Enable Chips & Technologies 69000 video driver"
+ depends on VIDEO
+ help
+ This enables a frame buffer driver for the Chips & Technologies
+ ct69000, a fairly old graphics device (circa 2000) which is used
+ on some hardware. It operates over the ISA bus, and supports
+ some acceleration features.
+
+ For the CT69000 and SMI_LYNXEM drivers, videomode is
+ selected via environment 'videomode'. Two different ways
+ are possible:
+ - "videomode=num" 'num' is a standard LiLo mode numbers.
+ Following standard modes are supported (* is default):
+
+ Colors 640x480 800x600 1024x768 1152x864 1280x1024
+ -------------+---------------------------------------------
+ 8 bits | 0x301* 0x303 0x305 0x161 0x307
+ 15 bits | 0x310 0x313 0x316 0x162 0x319
+ 16 bits | 0x311 0x314 0x317 0x163 0x31A
+ 24 bits | 0x312 0x315 0x318 ? 0x31B
+ -------------+---------------------------------------------
+ (i.e. setenv videomode 317; saveenv; reset;)
+
+ - "videomode=bootargs" all the video parameters are parsed
+ from the bootargs. (See drivers/video/videomodes.c)
+
endmenu
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index e9f0369..501411b 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -342,7 +342,6 @@
/************************************************************
* Video support
************************************************************/
-#define CONFIG_VIDEO_CT69000
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 6110f28..54dbe4c 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -302,7 +302,6 @@
/************************************************************
* Video support
************************************************************/
-#define CONFIG_VIDEO_CT69000
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
#define CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4669924..e355222 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8276,7 +8276,6 @@ CONFIG_VIDEO_BMP_GZIP
CONFIG_VIDEO_BMP_LOGO
CONFIG_VIDEO_BMP_RLE8
CONFIG_VIDEO_CORALP
-CONFIG_VIDEO_CT69000
CONFIG_VIDEO_DA8XX
CONFIG_VIDEO_DT_SIMPLEFB
CONFIG_VIDEO_FONT_4X6
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 11/29] Convert CONFIG_SYS_CONSOLE_BG_COL et al to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (9 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 10/29] Convert CONFIG_VIDEO_CT69000 " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:04 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 12/29] video: Drop the smiLynxEM driver Simon Glass
` (18 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_BG_COL
CONFIG_SYS_CONSOLE_FG_COL
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
README | 5 ---
configs/pxm2_defconfig | 2 +
configs/rut_defconfig | 2 +
drivers/video/Kconfig | 22 ++++++++++
drivers/video/cfb_console.c | 98 ++++++++++++++++++++++----------------------
drivers/video/ct69000.c | 3 +-
include/configs/pxm2.h | 2 -
include/configs/rut.h | 2 -
include/video_fb.h | 8 ----
scripts/config_whitelist.txt | 2 -
10 files changed, 78 insertions(+), 68 deletions(-)
diff --git a/README b/README
index 9e72a82..53a9333 100644
--- a/README
+++ b/README
@@ -810,11 +810,6 @@ The following options need to be configured:
port routines must be defined elsewhere
(i.e. serial_init(), serial_getc(), ...)
- CONFIG_SYS_CONSOLE_BG_COL: define the backgroundcolor, default
- is 0x00.
- CONFIG_SYS_CONSOLE_FG_COL: define the foregroundcolor, default
- is 0xa0.
-
- Console Baudrate:
CONFIG_BAUDRATE - in bps
Select one of the baudrates listed in
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index d667c9b..8b0e999 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -59,3 +59,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_SYS_CONSOLE_BG_COL=0xff
+CONFIG_SYS_CONSOLE_FG_COL=0x00
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 56ba5e8..ecc3e72 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -59,3 +59,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_SYS_CONSOLE_BG_COL=0xff
+CONFIG_SYS_CONSOLE_FG_COL=0x00
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 34dcf65..2150830 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -499,4 +499,26 @@ config VIDEO_CT69000
- "videomode=bootargs" all the video parameters are parsed
from the bootargs. (See drivers/video/videomodes.c)
+config SYS_CONSOLE_BG_COL
+ hex "Background colour"
+ depends on CFB_CONSOLE || VIDEO_CT69000
+ default 0x00
+ help
+ Defines the background colour for the console. The value is from
+ 0x00 to 0xff and the meaning depends on the graphics card.
+ Typically, 0x00 means black and 0xff means white. Do not set
+ the background and foreground to the same colour or you will see
+ nothing.
+
+config SYS_CONSOLE_FG_COL
+ hex "Foreground colour"
+ depends on CFB_CONSOLE || VIDEO_CT69000
+ default 0xa0
+ help
+ Defines the foreground colour for the console. The value is from
+ 0x00 to 0xff and the meaning depends on the graphics card.
+ Typically, 0x00 means black and 0xff means white. Do not set
+ the background and foreground to the same colour or you will see
+ nothing.
+
endmenu
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 30b53db..949187c 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -2093,70 +2093,72 @@ static int video_init(void)
/* Init drawing pats */
switch (VIDEO_DATA_FORMAT) {
case GDF__8BIT_INDEX:
- video_set_lut(0x01, CONSOLE_FG_COL, CONSOLE_FG_COL,
- CONSOLE_FG_COL);
- video_set_lut(0x00, CONSOLE_BG_COL, CONSOLE_BG_COL,
- CONSOLE_BG_COL);
+ video_set_lut(0x01, CONFIG_SYS_CONSOLE_FG_COL,
+ CONFIG_SYS_CONSOLE_FG_COL,
+ CONFIG_SYS_CONSOLE_FG_COL);
+ video_set_lut(0x00, CONFIG_SYS_CONSOLE_BG_COL,
+ CONFIG_SYS_CONSOLE_BG_COL,
+ CONFIG_SYS_CONSOLE_BG_COL);
fgx = 0x01010101;
bgx = 0x00000000;
break;
case GDF__8BIT_332RGB:
- color8 = ((CONSOLE_FG_COL & 0xe0) |
- ((CONSOLE_FG_COL >> 3) & 0x1c) |
- CONSOLE_FG_COL >> 6);
+ color8 = ((CONFIG_SYS_CONSOLE_FG_COL & 0xe0) |
+ ((CONFIG_SYS_CONSOLE_FG_COL >> 3) & 0x1c) |
+ CONFIG_SYS_CONSOLE_FG_COL >> 6);
fgx = (color8 << 24) | (color8 << 16) | (color8 << 8) |
color8;
- color8 = ((CONSOLE_BG_COL & 0xe0) |
- ((CONSOLE_BG_COL >> 3) & 0x1c) |
- CONSOLE_BG_COL >> 6);
+ color8 = ((CONFIG_SYS_CONSOLE_BG_COL & 0xe0) |
+ ((CONFIG_SYS_CONSOLE_BG_COL >> 3) & 0x1c) |
+ CONFIG_SYS_CONSOLE_BG_COL >> 6);
bgx = (color8 << 24) | (color8 << 16) | (color8 << 8) |
color8;
break;
case GDF_15BIT_555RGB:
- fgx = (((CONSOLE_FG_COL >> 3) << 26) |
- ((CONSOLE_FG_COL >> 3) << 21) |
- ((CONSOLE_FG_COL >> 3) << 16) |
- ((CONSOLE_FG_COL >> 3) << 10) |
- ((CONSOLE_FG_COL >> 3) << 5) |
- (CONSOLE_FG_COL >> 3));
- bgx = (((CONSOLE_BG_COL >> 3) << 26) |
- ((CONSOLE_BG_COL >> 3) << 21) |
- ((CONSOLE_BG_COL >> 3) << 16) |
- ((CONSOLE_BG_COL >> 3) << 10) |
- ((CONSOLE_BG_COL >> 3) << 5) |
- (CONSOLE_BG_COL >> 3));
+ fgx = (((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 26) |
+ ((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 21) |
+ ((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 16) |
+ ((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 10) |
+ ((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 5) |
+ (CONFIG_SYS_CONSOLE_FG_COL >> 3));
+ bgx = (((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 26) |
+ ((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 21) |
+ ((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 16) |
+ ((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 10) |
+ ((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 5) |
+ (CONFIG_SYS_CONSOLE_BG_COL >> 3));
break;
case GDF_16BIT_565RGB:
- fgx = (((CONSOLE_FG_COL >> 3) << 27) |
- ((CONSOLE_FG_COL >> 2) << 21) |
- ((CONSOLE_FG_COL >> 3) << 16) |
- ((CONSOLE_FG_COL >> 3) << 11) |
- ((CONSOLE_FG_COL >> 2) << 5) |
- (CONSOLE_FG_COL >> 3));
- bgx = (((CONSOLE_BG_COL >> 3) << 27) |
- ((CONSOLE_BG_COL >> 2) << 21) |
- ((CONSOLE_BG_COL >> 3) << 16) |
- ((CONSOLE_BG_COL >> 3) << 11) |
- ((CONSOLE_BG_COL >> 2) << 5) |
- (CONSOLE_BG_COL >> 3));
+ fgx = (((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 27) |
+ ((CONFIG_SYS_CONSOLE_FG_COL >> 2) << 21) |
+ ((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 16) |
+ ((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 11) |
+ ((CONFIG_SYS_CONSOLE_FG_COL >> 2) << 5) |
+ (CONFIG_SYS_CONSOLE_FG_COL >> 3));
+ bgx = (((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 27) |
+ ((CONFIG_SYS_CONSOLE_BG_COL >> 2) << 21) |
+ ((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 16) |
+ ((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 11) |
+ ((CONFIG_SYS_CONSOLE_BG_COL >> 2) << 5) |
+ (CONFIG_SYS_CONSOLE_BG_COL >> 3));
break;
case GDF_32BIT_X888RGB:
- fgx = (CONSOLE_FG_COL << 16) |
- (CONSOLE_FG_COL << 8) |
- CONSOLE_FG_COL;
- bgx = (CONSOLE_BG_COL << 16) |
- (CONSOLE_BG_COL << 8) |
- CONSOLE_BG_COL;
+ fgx = (CONFIG_SYS_CONSOLE_FG_COL << 16) |
+ (CONFIG_SYS_CONSOLE_FG_COL << 8) |
+ CONFIG_SYS_CONSOLE_FG_COL;
+ bgx = (CONFIG_SYS_CONSOLE_BG_COL << 16) |
+ (CONFIG_SYS_CONSOLE_BG_COL << 8) |
+ CONFIG_SYS_CONSOLE_BG_COL;
break;
case GDF_24BIT_888RGB:
- fgx = (CONSOLE_FG_COL << 24) |
- (CONSOLE_FG_COL << 16) |
- (CONSOLE_FG_COL << 8) |
- CONSOLE_FG_COL;
- bgx = (CONSOLE_BG_COL << 24) |
- (CONSOLE_BG_COL << 16) |
- (CONSOLE_BG_COL << 8) |
- CONSOLE_BG_COL;
+ fgx = (CONFIG_SYS_CONSOLE_FG_COL << 24) |
+ (CONFIG_SYS_CONSOLE_FG_COL << 16) |
+ (CONFIG_SYS_CONSOLE_FG_COL << 8) |
+ CONFIG_SYS_CONSOLE_FG_COL;
+ bgx = (CONFIG_SYS_CONSOLE_BG_COL << 24) |
+ (CONFIG_SYS_CONSOLE_BG_COL << 16) |
+ (CONFIG_SYS_CONSOLE_BG_COL << 8) |
+ CONFIG_SYS_CONSOLE_BG_COL;
break;
}
eorx = fgx ^ bgx;
diff --git a/drivers/video/ct69000.c b/drivers/video/ct69000.c
index 22b3441..349da5e 100644
--- a/drivers/video/ct69000.c
+++ b/drivers/video/ct69000.c
@@ -870,7 +870,8 @@ video_init_hw_cursor (int font_width, int font_height)
xr_80 = ctRead_i (CT_XR_O, 0x80);
xr_80 |= 0x1; /* alternate palette select */
ctWrite_i (CT_XR_O, 0x80, xr_80);
- video_set_lut (4, CONSOLE_FG_COL, CONSOLE_FG_COL, CONSOLE_FG_COL);
+ video_set_lut(4, CONFIG_SYS_CONSOLE_FG_COL, CONFIG_SYS_CONSOLE_FG_COL,
+ CONFIG_SYS_CONSOLE_FG_COL);
/* position 4 is color 0 cursor 0 */
xr_80 &= 0xfe; /* normal palette select */
ctWrite_i (CT_XR_O, 0x80, xr_80);
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index ba14593..6cc8d6c 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -136,8 +136,6 @@
#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE
#define PWM_TICKS 0x1388
#define PWM_DUTY 0x200
-#define CONFIG_SYS_CONSOLE_BG_COL 0xff
-#define CONFIG_SYS_CONSOLE_FG_COL 0x00
#endif
#endif /* ! __CONFIG_PXM2_H */
diff --git a/include/configs/rut.h b/include/configs/rut.h
index ca812e4..11f9a25 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -136,8 +136,6 @@
#define CONFIG_ARCH_EARLY_INIT_R
#define CONFIG_FORMIKE
#define DISPL_PLL_SPREAD_SPECTRUM
-#define CONFIG_SYS_CONSOLE_BG_COL 0xff
-#define CONFIG_SYS_CONSOLE_FG_COL 0x00
#endif
#endif /* ! __CONFIG_RUT_H */
diff --git a/include/video_fb.h b/include/video_fb.h
index 55ec24d..b7e3aee 100644
--- a/include/video_fb.h
+++ b/include/video_fb.h
@@ -18,14 +18,6 @@
#ifndef _VIDEO_FB_H_
#define _VIDEO_FB_H_
-#if defined(CONFIG_SYS_CONSOLE_FG_COL) && defined(CONFIG_SYS_CONSOLE_BG_COL)
-#define CONSOLE_BG_COL CONFIG_SYS_CONSOLE_BG_COL
-#define CONSOLE_FG_COL CONFIG_SYS_CONSOLE_FG_COL
-#else
-#define CONSOLE_BG_COL 0x00
-#define CONSOLE_FG_COL 0xa0
-#endif
-
/*
* Graphic Data Format (GDF) bits for VIDEO_DATA_FORMAT
*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e355222..606341b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4614,9 +4614,7 @@ CONFIG_SYS_CMXFCR_VALUE1
CONFIG_SYS_CMXFCR_VALUE2
CONFIG_SYS_CMXFCR_VALUE3
CONFIG_SYS_CMXSCR_VALUE
-CONFIG_SYS_CONSOLE_BG_COL
CONFIG_SYS_CONSOLE_ENV_OVERWRITE
-CONFIG_SYS_CONSOLE_FG_COL
CONFIG_SYS_CONSOLE_INFO_QUIET
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
CONFIG_SYS_CORE_SRAM
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 12/29] video: Drop the smiLynxEM driver
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (10 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 11/29] Convert CONFIG_SYS_CONSOLE_BG_COL et al " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:05 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 13/29] video: Drop the imx25lcdc driver Simon Glass
` (17 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This is not used in U-Boot anymore.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
README | 6 -
drivers/video/Makefile | 1 -
drivers/video/cfb_console.c | 13 -
drivers/video/smiLynxEM.c | 835 -------------------------------------------
scripts/config_whitelist.txt | 1 -
5 files changed, 856 deletions(-)
delete mode 100644 drivers/video/smiLynxEM.c
diff --git a/README b/README
index 53a9333..cab4ebb 100644
--- a/README
+++ b/README
@@ -1665,12 +1665,6 @@ CBFS (Coreboot Filesystem) support
instead.
- Video support:
- CONFIG_VIDEO_SMI_LYNXEM
- Enable Silicon Motion SMI 712/710/810 Video chip. The
- video output is selected via environment 'videoout'
- (1 = LCD and 2 = CRT). If videoout is undefined, CRT is
- assumed.
-
CONFIG_VIDEO_SED13806
Enable Epson SED13806 driver. This driver supports 8bpp
and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 3f045fe..2df2015 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -53,7 +53,6 @@ obj-$(CONFIG_VIDEO_S3C) += s3c-fb.o videomodes.o
obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o
obj-$(CONFIG_VIDEO_SED13806) += sed13806.o
obj-$(CONFIG_VIDEO_SM501) += sm501.o
-obj-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o videomodes.o
obj-$(CONFIG_VIDEO_TEGRA20) += tegra.o
obj-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 949187c..a087d2e 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -27,7 +27,6 @@
*
* (for SMI LynxE graphic chip)
*
- * CONFIG_VIDEO_SMI_LYNXEM - use graphic driver for SMI 710,712,810
* VIDEO_FB_LITTLE_ENDIAN - framebuffer organisation default: big endian
* VIDEO_HW_RECTFILL - graphic driver supports hardware rectangle fill
* VIDEO_HW_BITBLT - graphic driver supports hardware bit blt
@@ -87,18 +86,6 @@
#include <linux/compiler.h>
/*
- * Console device defines with SMI graphic
- * Any other graphic must change this section
- */
-
-#ifdef CONFIG_VIDEO_SMI_LYNXEM
-
-#define VIDEO_FB_LITTLE_ENDIAN
-#define VIDEO_HW_RECTFILL
-#define VIDEO_HW_BITBLT
-#endif
-
-/*
* Defines for the CT69000 driver
*/
#ifdef CONFIG_VIDEO_CT69000
diff --git a/drivers/video/smiLynxEM.c b/drivers/video/smiLynxEM.c
deleted file mode 100644
index 1880ccc..0000000
--- a/drivers/video/smiLynxEM.c
+++ /dev/null
@@ -1,835 +0,0 @@
-/*
- * (C) Copyright 1997-2002 ELTEC Elektronik AG
- * Frank Gottschling <fgottschling@eltec.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-/*
- * smiLynxEM.c
- *
- * Silicon Motion graphic interface for sm810/sm710/sm712 accelerator
- *
- * modification history
- * --------------------
- * 04-18-2002 Rewritten for U-Boot <fgottschling@eltec.de>.
- *
- * 18-03-2004 - Unify videomodes handling with the ct69000
- * - The video output can be set via the variable "videoout"
- * in the environment.
- * videoout=1 output on LCD
- * videoout=2 output on CRT (default value)
- * <p.aubert@staubli.com>
- */
-
-#include <common.h>
-
-#include <pci.h>
-#include <video_fb.h>
-#include "videomodes.h"
-/*
- * Export Graphic Device
- */
-GraphicDevice smi;
-
-/*
- * SMI 710/712 have 4MB internal RAM; SMI 810 2MB internal + 2MB external
- */
-#define VIDEO_MEM_SIZE 0x400000
-
-
-/*
- * ISA mapped regs
- */
-#define SMI_INDX_C4 (pGD->isaBase + 0x03c4) /* index reg */
-#define SMI_DATA_C5 (pGD->isaBase + 0x03c5) /* data reg */
-#define SMI_INDX_D4 (pGD->isaBase + 0x03d4) /* index reg */
-#define SMI_DATA_D5 (pGD->isaBase + 0x03d5) /* data reg */
-#define SMI_ISR1 (pGD->isaBase + 0x03ca)
-#define SMI_INDX_CE (pGD->isaBase + 0x03ce) /* index reg */
-#define SMI_DATA_CF (pGD->isaBase + 0x03cf) /* data reg */
-#define SMI_LOCK_REG (pGD->isaBase + 0x03c3) /* unlock/lock ext crt reg */
-#define SMI_MISC_REG (pGD->isaBase + 0x03c2) /* misc reg */
-#define SMI_LUT_MASK (pGD->isaBase + 0x03c6) /* lut mask reg */
-#define SMI_LUT_START (pGD->isaBase + 0x03c8) /* lut start index */
-#define SMI_LUT_RGB (pGD->isaBase + 0x03c9) /* lut colors auto incr.*/
-#define SMI_INDX_ATTR (pGD->isaBase + 0x03c0) /* attributes index reg */
-
-/*
- * Video processor control
- */
-typedef struct {
- unsigned int control;
- unsigned int colorKey;
- unsigned int colorKeyMask;
- unsigned int start;
- unsigned short offset;
- unsigned short width;
- unsigned int fifoPrio;
- unsigned int fifoERL;
- unsigned int YUVtoRGB;
-} SmiVideoProc;
-
-/*
- * Video window control
- */
-typedef struct {
- unsigned short top;
- unsigned short left;
- unsigned short bottom;
- unsigned short right;
- unsigned int srcStart;
- unsigned short width;
- unsigned short offset;
- unsigned char hStretch;
- unsigned char vStretch;
-} SmiVideoWin;
-
-/*
- * Capture port control
- */
-typedef struct {
- unsigned int control;
- unsigned short topClip;
- unsigned short leftClip;
- unsigned short srcHeight;
- unsigned short srcWidth;
- unsigned int srcBufStart1;
- unsigned int srcBufStart2;
- unsigned short srcOffset;
- unsigned short fifoControl;
-} SmiCapturePort;
-
-
-/*
- * Register values for common video modes
- */
-static char SMI_SCR[] = {
- /* all modes */
- 0x10, 0xff, 0x11, 0xff, 0x12, 0xff, 0x13, 0xff, 0x15, 0x90,
- 0x17, 0x20, 0x18, 0xb1, 0x19, 0x00,
-};
-static char SMI_EXT_CRT[] = {
- 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00,
- 0x36, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00,
-};
-static char SMI_ATTR [] = {
- 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05,
- 0x06, 0x06, 0x07, 0x07, 0x08, 0x08, 0x09, 0x09, 0x0a, 0x0a, 0x0b, 0x0b,
- 0x0c, 0x0c, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0f, 0x10, 0x41, 0x11, 0x00,
- 0x12, 0x0f, 0x13, 0x00, 0x14, 0x00,
-};
-static char SMI_GCR[18] = {
- 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x40,
- 0x06, 0x05, 0x07, 0x0f, 0x08, 0xff,
-};
-static char SMI_SEQR[] = {
- 0x00, 0x00, 0x01, 0x01, 0x02, 0x0f, 0x03, 0x03, 0x04, 0x0e, 0x00, 0x03,
-};
-static char SMI_PCR [] = {
- 0x20, 0x04, 0x21, 0x30, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00,
-};
-static char SMI_MCR[] = {
- 0x60, 0x01, 0x61, 0x00,
-};
-
-static char SMI_HCR[] = {
- 0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00,
- 0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00,
-};
-
-
-/*******************************************************************************
- *
- * Write SMI ISA register
- */
-static void smiWrite (unsigned short index, char reg, char val)
-{
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
-
- out8 ((pGD->isaBase + index), reg);
- out8 ((pGD->isaBase + index + 1), val);
-}
-
-/*******************************************************************************
- *
- * Write a table of SMI ISA register
- */
-static void smiLoadRegs (
- unsigned int iReg,
- unsigned int dReg,
- char *regTab,
- unsigned int tabSize
- )
-{
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
- register int i;
-
- for (i=0; i<tabSize; i+=2) {
- if (iReg == SMI_INDX_ATTR) {
- /* Reset the Flip Flop */
- in8 (SMI_ISR1);
- out8 (iReg, regTab[i]);
- out8 (iReg, regTab[i+1]);
- } else {
- out8 (iReg, regTab[i]);
- out8 (dReg, regTab[i+1]);
- }
- }
-}
-
-/*******************************************************************************
- *
- * Init capture port registers
- */
-static void smiInitCapturePort (void)
-{
- SmiCapturePort smiCP = { 0x01400600, 0x30, 0x40, 480, 640, 0, 0, 2560, 6 };
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
- register SmiCapturePort *pCP = (SmiCapturePort *)&smiCP;
-
- out32r ((pGD->cprBase + 0x0004), ((pCP->topClip<<16) | pCP->leftClip));
- out32r ((pGD->cprBase + 0x0008), ((pCP->srcHeight<<16) | pCP->srcWidth));
- out32r ((pGD->cprBase + 0x000c), pCP->srcBufStart1/8);
- out32r ((pGD->cprBase + 0x0010), pCP->srcBufStart2/8);
- out32r ((pGD->cprBase + 0x0014), pCP->srcOffset/8);
- out32r ((pGD->cprBase + 0x0018), pCP->fifoControl);
- out32r ((pGD->cprBase + 0x0000), pCP->control);
-}
-
-
-/*******************************************************************************
- *
- * Init video processor registers
- */
-static void smiInitVideoProcessor (void)
-{
- SmiVideoProc smiVP = { 0x100000, 0, 0, 0, 0, 1600, 0x1200543, 4, 0xededed };
- SmiVideoWin smiVW = { 0, 0, 599, 799, 0, 1600, 0, 0, 0 };
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
- register SmiVideoProc *pVP = (SmiVideoProc *)&smiVP;
- register SmiVideoWin *pVWin = (SmiVideoWin *)&smiVW;
-
- pVP->width = pGD->plnSizeX * pGD->gdfBytesPP;
- pVP->control |= pGD->gdfIndex << 16;
- pVWin->bottom = pGD->winSizeY - 1;
- pVWin->right = pGD->winSizeX - 1;
- pVWin->width = pVP->width;
-
- /* color key */
- out32r ((pGD->vprBase + 0x0004), pVP->colorKey);
-
- /* color key mask */
- out32r ((pGD->vprBase + 0x0008), pVP->colorKeyMask);
-
- /* data src start adrs */
- out32r ((pGD->vprBase + 0x000c), pVP->start / 8);
-
- /* data width and offset */
- out32r ((pGD->vprBase + 0x0010),
- ((pVP->offset / 8 * pGD->gdfBytesPP) << 16) |
- (pGD->plnSizeX / 8 * pGD->gdfBytesPP));
-
- /* video window 1 */
- out32r ((pGD->vprBase + 0x0014),
- ((pVWin->top << 16) | pVWin->left));
-
- out32r ((pGD->vprBase + 0x0018),
- ((pVWin->bottom << 16) | pVWin->right));
-
- out32r ((pGD->vprBase + 0x001c), pVWin->srcStart / 8);
-
- out32r ((pGD->vprBase + 0x0020),
- (((pVWin->offset / 8) << 16) | (pVWin->width / 8)));
-
- out32r ((pGD->vprBase + 0x0024),
- (((pVWin->hStretch) << 8) | pVWin->vStretch));
-
- /* video window 2 */
- out32r ((pGD->vprBase + 0x0028),
- ((pVWin->top << 16) | pVWin->left));
-
- out32r ((pGD->vprBase + 0x002c),
- ((pVWin->bottom << 16) | pVWin->right));
-
- out32r ((pGD->vprBase + 0x0030),
- pVWin->srcStart / 8);
-
- out32r ((pGD->vprBase + 0x0034),
- (((pVWin->offset / 8) << 16) | (pVWin->width / 8)));
-
- out32r ((pGD->vprBase + 0x0038),
- (((pVWin->hStretch) << 8) | pVWin->vStretch));
-
- /* fifo prio control */
- out32r ((pGD->vprBase + 0x0054), pVP->fifoPrio);
-
- /* fifo empty request levell */
- out32r ((pGD->vprBase + 0x0058), pVP->fifoERL);
-
- /* conversion constant */
- out32r ((pGD->vprBase + 0x005c), pVP->YUVtoRGB);
-
- /* vpr control word */
- out32r ((pGD->vprBase + 0x0000), pVP->control);
-}
-
-/******************************************************************************
- *
- * Init drawing engine registers
- */
-static void smiInitDrawingEngine (void)
-{
- GraphicDevice *pGD = (GraphicDevice *)&smi;
- unsigned int val;
-
- /* don't start now */
- out32r ((pGD->dprBase + 0x000c), 0x000f0000);
-
- /* set rop2 to copypen */
- val = 0xffff3ff0 & in32r ((pGD->dprBase + 0x000c));
- out32r ((pGD->dprBase + 0x000c), (val | 0x8000 | 0x0c));
-
- /* set clip rect */
- out32r ((pGD->dprBase + 0x002c), 0);
- out32r ((pGD->dprBase + 0x0030),
- ((pGD->winSizeY<<16) | pGD->winSizeX * pGD->gdfBytesPP ));
-
- /* src row pitch */
- val = 0xffff0000 & (in32r ((pGD->dprBase + 0x0010)));
- out32r ((pGD->dprBase + 0x0010),
- (val | pGD->plnSizeX * pGD->gdfBytesPP));
-
- /* dst row pitch */
- val = 0x0000ffff & (in32r ((pGD->dprBase + 0x0010)));
- out32r ((pGD->dprBase + 0x0010),
- (((pGD->plnSizeX * pGD->gdfBytesPP)<<16) | val));
-
- /* window width src/dst */
- out32r ((pGD->dprBase + 0x003c),
- (((pGD->plnSizeX * pGD->gdfBytesPP & 0x0fff)<<16) |
- (pGD->plnSizeX * pGD->gdfBytesPP & 0x0fff)));
- out16r ((pGD->dprBase + 0x001e), 0x0000);
-
- /* src base adrs */
- out32r ((pGD->dprBase + 0x0040),
- (((pGD->frameAdrs/8) & 0x000fffff)));
-
- /* dst base adrs */
- out32r ((pGD->dprBase + 0x0044),
- (((pGD->frameAdrs/8) & 0x000fffff)));
-
- /* foreground color */
- out32r ((pGD->dprBase + 0x0014), pGD->fg);
-
- /* background color */
- out32r ((pGD->dprBase + 0x0018), pGD->bg);
-
- /* xcolor */
- out32r ((pGD->dprBase + 0x0020), 0x00ffffff);
-
- /* xcolor mask */
- out32r ((pGD->dprBase + 0x0024), 0x00ffffff);
-
- /* bit mask */
- out32r ((pGD->dprBase + 0x0028), 0x00ffffff);
-
- /* load mono pattern */
- out32r ((pGD->dprBase + 0x0034), 0);
- out32r ((pGD->dprBase + 0x0038), 0);
-}
-
-static struct pci_device_id supported[] = {
- { PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_710 },
- { PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_712 },
- { PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_810 },
- { }
-};
-
-/*****************************************************************************/
-static void smiLoadMsr (struct ctfb_res_modes *mode)
-{
- unsigned char h_synch_high, v_synch_high;
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
-
- h_synch_high = (mode->sync & FB_SYNC_HOR_HIGH_ACT) ? 0 : 0x40; /* horizontal Synch High active */
- v_synch_high = (mode->sync & FB_SYNC_VERT_HIGH_ACT) ? 0 : 0x80; /* vertical Synch High active */
- out8 (SMI_MISC_REG, (h_synch_high | v_synch_high | 0x29));
- /* upper64K==0x20, CLC2select==0x08, RAMenable==0x02!(todo), CGA==0x01
- * Selects the upper 64KB page.Bit5=1
- * CLK2 (left reserved in standard VGA) Bit3|2=1|0
- * Disables CPU access to frame buffer. Bit1=0
- * Sets the I/O address decode for ST01, FCR, and all CR registers
- * to the 3Dx I/O address range (CGA emulation). Bit0=1
- */
-}
-/*****************************************************************************/
-static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
-{
- unsigned char cr[0x7a];
- int i;
- unsigned int hd, hs, he, ht, hbs, hbe; /* Horizontal. */
- unsigned int vd, vs, ve, vt, vbs, vbe; /* vertical */
- unsigned int bpp, wd, dblscan, interlaced;
-
- const int LineCompare = 0x3ff;
- unsigned int TextScanLines = 1; /* this is in fact a vertical zoom factor */
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
-
- /* Horizontal */
- hd = (var->xres) / 8; /* HDisp. */
- hs = (var->xres + var->right_margin) / 8; /* HsStrt */
- he = (var->xres + var->right_margin + var->hsync_len) / 8; /* HsEnd */
- ht = (var->left_margin + var->xres + var->right_margin + var->hsync_len) / 8; /* HTotal */
- /* Blank */
- hbs = hd;
- hbe = 0; /* Blank end at 0 */
-
- /* Vertical */
- vd = var->yres; /* VDisplay */
- vs = var->yres + var->lower_margin; /* VSyncStart */
- ve = var->yres + var->lower_margin + var->vsync_len; /* VSyncEnd */
- vt = var->upper_margin + var->yres + var->lower_margin + var->vsync_len; /* VTotal */
- vbs = vd;
- vbe = 0;
-
- bpp = bits_per_pixel;
- dblscan = (var->vmode & FB_VMODE_DOUBLE) ? 1 : 0;
- interlaced = var->vmode & FB_VMODE_INTERLACED;
-
-
- if (bpp == 15)
- bpp = 16;
- wd = var->xres * bpp / 64; /* double words per line */
- if (interlaced) { /* we divide all vertical timings, exept vd */
- vs >>= 1;
- vbs >>= 1;
- ve >>= 1;
- vt >>= 1;
- }
-
- memset (cr, 0, sizeof (cr));
- cr[0x00] = ht - 5;
- cr[0x01] = hd - 1;
- cr[0x02] = hbs - 1;
- cr[0x03] = (hbe & 0x1F);
- cr[0x04] = hs;
- cr[0x05] = ((hbe & 0x20) << 2) | (he & 0x1f);
-
- cr[0x06] = (vt - 2) & 0xFF;
- cr[0x07] = (((vt - 2) & 0x100) >> 8)
- | (((vd - 1) & 0x100) >> 7)
- | ((vs & 0x100) >> 6)
- | (((vbs - 1) & 0x100) >> 5)
- | ((LineCompare & 0x100) >> 4)
- | (((vt - 2) & 0x200) >> 4)
- | (((vd - 1) & 0x200) >> 3)
- | ((vs & 0x200) >> 2);
-
- cr[0x30] = ((vt - 2) & 0x400) >> 7
- | (((vd - 1) & 0x400) >> 8)
- | (((vbs - 1) & 0x400) >> 9)
- | ((vs & 0x400) >> 10)
- | (interlaced) ? 0x80 : 0;
-
-
- cr[0x08] = 0x00;
- cr[0x09] = (dblscan << 7)
- | ((LineCompare & 0x200) >> 3)
- | (((vbs - 1) & 0x200) >> 4)
- | (TextScanLines - 1);
-
- cr[0x10] = vs & 0xff; /* VSyncPulseStart */
- cr[0x11] = (ve & 0x0f);
- cr[0x12] = (vd - 1) & 0xff; /* LineCount */
- cr[0x13] = wd & 0xff;
- cr[0x14] = 0x40;
- cr[0x15] = (vbs - 1) & 0xff;
- cr[0x16] = vbe & 0xff;
- cr[0x17] = 0xe3; /* but it does not work */
- cr[0x18] = 0xff & LineCompare;
- cr[0x22] = 0x00; /* todo? */
-
-
- /* now set the registers */
- for (i = 0; i <= 0x18; i++) { /*CR00 .. CR18 */
- smiWrite (SMI_INDX_D4, i, cr[i]);
- }
- i = 0x22; /*CR22 */
- smiWrite (SMI_INDX_D4, i, cr[i]);
- i = 0x30; /*CR30 */
- smiWrite (SMI_INDX_D4, i, cr[i]);
-}
-
-/*****************************************************************************/
-#define REF_FREQ 14318180
-#define PMIN 1
-#define PMAX 255
-#define QMIN 1
-#define QMAX 63
-
-static unsigned int FindPQ (unsigned int freq, unsigned int *pp, unsigned int *pq)
-{
- unsigned int n = QMIN, m = 0;
- long long int L = 0, P = freq, Q = REF_FREQ, H = P >> 1;
- long long int D = 0x7ffffffffffffffLL;
-
- for (n = QMIN; n <= QMAX; n++) {
- m = PMIN; /* p/q ~ freq/ref -> p*ref-freq*q ~ 0 */
- L = P * n - m * Q;
- while (L > 0 && m < PMAX) {
- L -= REF_FREQ; /* difference is greater as 0 subtract fref */
- m++; /* and increment m */
- }
- /* difference is less or equal than 0 or m > maximum */
- if (m > PMAX)
- break; /* no solution: if we increase n we get the same situation */
- /* L is <= 0 now */
- if (-L > H && m > PMIN) { /* if difference > the half fref */
- L += REF_FREQ; /* we take the situation before */
- m--; /* because its closer to 0 */
- }
- L = (L < 0) ? -L : +L; /* absolute value */
- if (D < L) /* if last difference was better take next n */
- continue;
- D = L;
- *pp = m;
- *pq = n; /* keep improved data */
- if (D == 0)
- break; /* best result we can get */
- }
- return (unsigned int) (0xffffffff & D);
-}
-
-/*****************************************************************************/
-static void smiLoadCcr (struct ctfb_res_modes *var, unsigned short device_id)
-{
- unsigned int p = 0;
- unsigned int q = 0;
- long long freq;
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
-
- smiWrite (SMI_INDX_C4, 0x65, 0);
- smiWrite (SMI_INDX_C4, 0x66, 0);
- smiWrite (SMI_INDX_C4, 0x68, 0x50);
- if (device_id == PCI_DEVICE_ID_SMI_810) {
- smiWrite (SMI_INDX_C4, 0x69, 0x3);
- } else {
- smiWrite (SMI_INDX_C4, 0x69, 0x0);
- }
-
- /* Memory clock */
- switch (device_id) {
- case PCI_DEVICE_ID_SMI_710 :
- smiWrite (SMI_INDX_C4, 0x6a, 0x75);
- break;
- case PCI_DEVICE_ID_SMI_712 :
- smiWrite (SMI_INDX_C4, 0x6a, 0x80);
- break;
- default :
- smiWrite (SMI_INDX_C4, 0x6a, 0x53);
- break;
- }
- smiWrite (SMI_INDX_C4, 0x6b, 0x15);
-
- /* VCLK */
- freq = 1000000000000LL / var -> pixclock;
-
- FindPQ ((unsigned int)freq, &p, &q);
-
- smiWrite (SMI_INDX_C4, 0x6c, p);
- smiWrite (SMI_INDX_C4, 0x6d, q);
-
-}
-
-/*******************************************************************************
- *
- * Init video chip with common Linux graphic modes (lilo)
- */
-void *video_hw_init (void)
-{
- GraphicDevice *pGD = (GraphicDevice *)&smi;
- unsigned short device_id;
- pci_dev_t devbusfn;
- int videomode;
- unsigned long t1, hsynch, vsynch;
- unsigned int pci_mem_base, *vm;
- char *penv;
- int tmp, i, bits_per_pixel;
- struct ctfb_res_modes *res_mode;
- struct ctfb_res_modes var_mode;
- unsigned char videoout;
-
- /* Search for video chip */
- printf("Video: ");
-
- if ((devbusfn = pci_find_devices(supported, 0)) < 0)
- {
- printf ("Controller not found !\n");
- return (NULL);
- }
-
- /* PCI setup */
- pci_write_config_dword (devbusfn, PCI_COMMAND, (PCI_COMMAND_MEMORY | PCI_COMMAND_IO));
- pci_read_config_word (devbusfn, PCI_DEVICE_ID, &device_id);
- pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, &pci_mem_base);
- pci_mem_base = pci_mem_to_phys (devbusfn, pci_mem_base);
-
- tmp = 0;
-
- videomode = CONFIG_SYS_DEFAULT_VIDEO_MODE;
- /* get video mode via environment */
- if ((penv = getenv ("videomode")) != NULL) {
- /* deceide if it is a string */
- if (penv[0] <= '9') {
- videomode = (int) simple_strtoul (penv, NULL, 16);
- tmp = 1;
- }
- } else {
- tmp = 1;
- }
- if (tmp) {
- /* parameter are vesa modes */
- /* search params */
- for (i = 0; i < VESA_MODES_COUNT; i++) {
- if (vesa_modes[i].vesanr == videomode)
- break;
- }
- if (i == VESA_MODES_COUNT) {
- printf ("no VESA Mode found, switching to mode 0x%x ", CONFIG_SYS_DEFAULT_VIDEO_MODE);
- i = 0;
- }
- res_mode =
- (struct ctfb_res_modes *) &res_mode_init[vesa_modes[i].
- resindex];
- bits_per_pixel = vesa_modes[i].bits_per_pixel;
- } else {
-
- res_mode = (struct ctfb_res_modes *) &var_mode;
- bits_per_pixel = video_get_params (res_mode, penv);
- }
-
- /* calculate hsynch and vsynch freq (info only) */
- t1 = (res_mode->left_margin + res_mode->xres +
- res_mode->right_margin + res_mode->hsync_len) / 8;
- t1 *= 8;
- t1 *= res_mode->pixclock;
- t1 /= 1000;
- hsynch = 1000000000L / t1;
- t1 *=
- (res_mode->upper_margin + res_mode->yres +
- res_mode->lower_margin + res_mode->vsync_len);
- t1 /= 1000;
- vsynch = 1000000000L / t1;
-
- /* fill in Graphic device struct */
- sprintf (pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz", res_mode->xres,
- res_mode->yres, bits_per_pixel, (hsynch / 1000),
- (vsynch / 1000));
- printf ("%s\n", pGD->modeIdent);
- pGD->winSizeX = res_mode->xres;
- pGD->winSizeY = res_mode->yres;
- pGD->plnSizeX = res_mode->xres;
- pGD->plnSizeY = res_mode->yres;
- switch (bits_per_pixel) {
- case 8:
- pGD->gdfBytesPP = 1;
- pGD->gdfIndex = GDF__8BIT_INDEX;
- break;
- case 15:
- pGD->gdfBytesPP = 2;
- pGD->gdfIndex = GDF_15BIT_555RGB;
- break;
- case 16:
- pGD->gdfBytesPP = 2;
- pGD->gdfIndex = GDF_16BIT_565RGB;
- break;
- case 24:
- pGD->gdfBytesPP = 3;
- pGD->gdfIndex = GDF_24BIT_888RGB;
- break;
- }
-
- pGD->isaBase = CONFIG_SYS_ISA_IO;
- pGD->pciBase = pci_mem_base;
- pGD->dprBase = (pci_mem_base + 0x400000 + 0x8000);
- pGD->vprBase = (pci_mem_base + 0x400000 + 0xc000);
- pGD->cprBase = (pci_mem_base + 0x400000 + 0xe000);
- pGD->frameAdrs = pci_mem_base;
- pGD->memSize = VIDEO_MEM_SIZE;
-
- /* Set up hardware : select color mode,
- set Register base to isa 3dx for 3?x regs*/
- out8 (SMI_MISC_REG, 0x01);
-
- /* Turn off display */
- smiWrite (SMI_INDX_C4, 0x01, 0x20);
-
- /* Unlock ext. crt regs */
- out8 (SMI_LOCK_REG, 0x40);
-
- /* Unlock crt regs 0-7 */
- smiWrite (SMI_INDX_D4, 0x11, 0x0e);
-
- /* Sytem Control Register */
- smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_SCR, sizeof(SMI_SCR));
-
- /* extented CRT Register */
- smiLoadRegs (SMI_INDX_D4, SMI_DATA_D5, SMI_EXT_CRT, sizeof(SMI_EXT_CRT));
-
- /* Attributes controller registers */
- smiLoadRegs (SMI_INDX_ATTR, SMI_INDX_ATTR, SMI_ATTR, sizeof(SMI_ATTR));
-
- /* Graphics Controller Register */
- smiLoadRegs (SMI_INDX_CE, SMI_DATA_CF, SMI_GCR, sizeof(SMI_GCR));
-
- /* Sequencer Register */
- smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_SEQR, sizeof(SMI_SEQR));
-
- /* Power Control Register */
- smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_PCR, sizeof(SMI_PCR));
-
- /* Memory Control Register */
- /* Register MSR62 is a power on configurable register. We don't */
- /* modify it */
- smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_MCR, sizeof(SMI_MCR));
-
- /* Set misc output register */
- smiLoadMsr (res_mode);
-
- /* Set CRT and Clock control registers */
- smiLoadCrt (res_mode, bits_per_pixel);
-
- smiLoadCcr (res_mode, device_id);
-
- /* Hardware Cusor Register */
- smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_HCR, sizeof(SMI_HCR));
-
- /* Enable Display */
- videoout = 2; /* Default output is CRT */
- if ((penv = getenv ("videoout")) != NULL) {
- /* deceide if it is a string */
- videoout = (int) simple_strtoul (penv, NULL, 16);
- }
- smiWrite (SMI_INDX_C4, 0x31, videoout);
-
- /* Video processor default setup */
- smiInitVideoProcessor ();
-
- /* Capture port default setup */
- smiInitCapturePort ();
-
- /* Drawing engine default setup */
- smiInitDrawingEngine ();
-
- /* Turn on display */
- smiWrite (0x3c4, 0x01, 0x01);
-
- /* Clear video memory */
- i = pGD->memSize/4;
- vm = (unsigned int *)pGD->pciBase;
- while(i--)
- *vm++ = 0;
- return ((void*)&smi);
-}
-
-/*******************************************************************************
- *
- * Drawing engine fill on screen region
- */
-void video_hw_rectfill (
- unsigned int bpp, /* bytes per pixel */
- unsigned int dst_x, /* dest pos x */
- unsigned int dst_y, /* dest pos y */
- unsigned int dim_x, /* frame width */
- unsigned int dim_y, /* frame height */
- unsigned int color /* fill color */
- )
-{
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
- register unsigned int control;
-
- dim_x *= bpp;
-
- out32r ((pGD->dprBase + 0x0014), color);
- out32r ((pGD->dprBase + 0x0004), ((dst_x<<16) | dst_y));
- out32r ((pGD->dprBase + 0x0008), ((dim_x<<16) | dim_y));
-
- control = 0x0000ffff & in32r ((pGD->dprBase + 0x000c));
-
- control |= 0x80010000;
-
- out32r ((pGD->dprBase + 0x000c), control);
-
- /* Wait for drawing processor */
- do
- {
- out8 ((pGD->isaBase + 0x3c4), 0x16);
- } while (in8 (pGD->isaBase + 0x3c5) & 0x08);
-}
-
-/*******************************************************************************
- *
- * Drawing engine bitblt with screen region
- */
-void video_hw_bitblt (
- unsigned int bpp, /* bytes per pixel */
- unsigned int src_x, /* source pos x */
- unsigned int src_y, /* source pos y */
- unsigned int dst_x, /* dest pos x */
- unsigned int dst_y, /* dest pos y */
- unsigned int dim_x, /* frame width */
- unsigned int dim_y /* frame height */
- )
-{
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
- register unsigned int control;
-
- dim_x *= bpp;
-
- if ((src_y<dst_y) || ((src_y==dst_y) && (src_x<dst_x)))
- {
- out32r ((pGD->dprBase + 0x0000), (((src_x+dim_x-1)<<16) | (src_y+dim_y-1)));
- out32r ((pGD->dprBase + 0x0004), (((dst_x+dim_x-1)<<16) | (dst_y+dim_y-1)));
- control = 0x88000000;
- } else {
- out32r ((pGD->dprBase + 0x0000), ((src_x<<16) | src_y));
- out32r ((pGD->dprBase + 0x0004), ((dst_x<<16) | dst_y));
- control = 0x80000000;
- }
-
- out32r ((pGD->dprBase + 0x0008), ((dim_x<<16) | dim_y));
- control |= (0x0000ffff & in32r ((pGD->dprBase + 0x000c)));
- out32r ((pGD->dprBase + 0x000c), control);
-
- /* Wait for drawing processor */
- do
- {
- out8 ((pGD->isaBase + 0x3c4), 0x16);
- } while (in8 (pGD->isaBase + 0x3c5) & 0x08);
-}
-
-/*******************************************************************************
- *
- * Set a RGB color in the LUT (8 bit index)
- */
-void video_set_lut (
- unsigned int index, /* color number */
- unsigned char r, /* red */
- unsigned char g, /* green */
- unsigned char b /* blue */
- )
-{
- register GraphicDevice *pGD = (GraphicDevice *)&smi;
-
- out8 (SMI_LUT_MASK, 0xff);
-
- out8 (SMI_LUT_START, (char)index);
-
- out8 (SMI_LUT_RGB, r>>2); /* red */
- udelay (10);
- out8 (SMI_LUT_RGB, g>>2); /* green */
- udelay (10);
- out8 (SMI_LUT_RGB, b>>2); /* blue */
- udelay (10);
-}
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 606341b..e5a7331 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8294,7 +8294,6 @@ CONFIG_VIDEO_SM501_16BPP
CONFIG_VIDEO_SM501_32BPP
CONFIG_VIDEO_SM501_8BPP
CONFIG_VIDEO_SM501_PCI
-CONFIG_VIDEO_SMI_LYNXEM
CONFIG_VIDEO_STD_TIMINGS
CONFIG_VIDEO_SUNXI
CONFIG_VIDEO_SW_CURSOR
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 13/29] video: Drop the imx25lcdc driver
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (11 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 12/29] video: Drop the smiLynxEM driver Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:05 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 14/29] video: Drop the s3c-fb driver Simon Glass
` (16 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This is not used anywhere in U-Boot.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
drivers/video/Makefile | 1 -
drivers/video/imx25lcdc.c | 121 ----------------------------------------------
2 files changed, 122 deletions(-)
delete mode 100644 drivers/video/imx25lcdc.c
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 2df2015..6bb9e28 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -39,7 +39,6 @@ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835.o
obj-$(CONFIG_VIDEO_COREBOOT) += coreboot_fb.o
obj-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o
obj-$(CONFIG_VIDEO_DA8XX) += da8xx-fb.o videomodes.o
-obj-$(CONFIG_VIDEO_IMX25LCDC) += imx25lcdc.o videomodes.o
obj-$(CONFIG_VIDEO_LCD_ANX9804) += anx9804.o
obj-$(CONFIG_VIDEO_LCD_HITACHI_TX18D42VM) += hitachi_tx18d42vm_lcd.o
obj-$(CONFIG_VIDEO_LCD_SSD2828) += ssd2828.o
diff --git a/drivers/video/imx25lcdc.c b/drivers/video/imx25lcdc.c
deleted file mode 100644
index ef5767b..0000000
--- a/drivers/video/imx25lcdc.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * (C) Copyright 2011
- * Matthias Weisser <weisserm@arcor.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
- *
- * imx25lcdc.c - Graphic interface for i.MX25 lcd controller
- */
-
-#include <common.h>
-
-#include <malloc.h>
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <video_fb.h>
-#include "videomodes.h"
-
-/*
- * 4MB (at the end of system RAM)
- */
-#define VIDEO_MEM_SIZE 0x400000
-
-#define FB_SYNC_CLK_INV (1<<16) /* pixel clock inverted */
-
-/*
- * Graphic Device
- */
-static GraphicDevice imx25fb;
-
-void *video_hw_init(void)
-{
- struct lcdc_regs *lcdc = (struct lcdc_regs *)IMX_LCDC_BASE;
- struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
- GraphicDevice *pGD = &imx25fb;
- char *s;
- u32 *videomem;
-
- memset(pGD, 0, sizeof(GraphicDevice));
-
- pGD->gdfIndex = GDF_16BIT_565RGB;
- pGD->gdfBytesPP = 2;
- pGD->memSize = VIDEO_MEM_SIZE;
- pGD->frameAdrs = PHYS_SDRAM + PHYS_SDRAM_SIZE - VIDEO_MEM_SIZE;
-
- videomem = (u32 *)pGD->frameAdrs;
-
- s = getenv("videomode");
- if (s != NULL) {
- struct ctfb_res_modes var_mode;
- u32 lsr, lpcr, lhcr, lvcr;
- unsigned long div;
- int bpp;
-
- /* Disable all clocks of the LCDC */
- writel(readl(&ccm->cgr0) & ~((1<<7) | (1<<24)), &ccm->cgr0);
- writel(readl(&ccm->cgr1) & ~(1<<29), &ccm->cgr1);
-
- bpp = video_get_params(&var_mode, s);
-
- if (bpp == 0) {
- var_mode.xres = 320;
- var_mode.yres = 240;
- var_mode.pixclock = 154000;
- var_mode.left_margin = 68;
- var_mode.right_margin = 20;
- var_mode.upper_margin = 4;
- var_mode.lower_margin = 18;
- var_mode.hsync_len = 40;
- var_mode.vsync_len = 6;
- var_mode.sync = 0;
- var_mode.vmode = 0;
- }
-
- /* Fill memory with white */
- memset(videomem, 0xFF, var_mode.xres * var_mode.yres * 2);
-
- imx25fb.winSizeX = var_mode.xres;
- imx25fb.winSizeY = var_mode.yres;
-
- /* LCD base clock is 66.6MHZ. We do calculations in kHz */
- div = 66000 / (1000000000L / var_mode.pixclock);
- if (div > 63)
- div = 63;
- if (0 == div)
- div = 1;
-
- lsr = ((var_mode.xres / 16) << 20) |
- var_mode.yres;
- lpcr = (1 << 31) |
- (1 << 30) |
- (5 << 25) |
- (1 << 23) |
- (1 << 22) |
- (1 << 19) |
- (1 << 7) |
- div;
- lhcr = (var_mode.right_margin << 0) |
- (var_mode.left_margin << 8) |
- (var_mode.hsync_len << 26);
-
- lvcr = (var_mode.lower_margin << 0) |
- (var_mode.upper_margin << 8) |
- (var_mode.vsync_len << 26);
-
- writel((uint32_t)videomem, &lcdc->lssar);
- writel(lsr, &lcdc->lsr);
- writel(var_mode.xres * 2 / 4, &lcdc->lvpwr);
- writel(lpcr, &lcdc->lpcr);
- writel(lhcr, &lcdc->lhcr);
- writel(lvcr, &lcdc->lvcr);
- writel(0x00040060, &lcdc->ldcr);
-
- writel(0xA90300, &lcdc->lpccr);
-
- /* Ensable all clocks of the LCDC */
- writel(readl(&ccm->cgr0) | ((1<<7) | (1<<24)), &ccm->cgr0);
- writel(readl(&ccm->cgr1) | (1<<29), &ccm->cgr1);
- }
-
- return pGD;
-}
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 14/29] video: Drop the s3c-fb driver
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (12 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 13/29] video: Drop the imx25lcdc driver Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:06 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 15/29] video: Drop the sed13806 driver Simon Glass
` (15 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This is not used in U-Boot.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
drivers/video/Makefile | 1 -
drivers/video/cfb_console.c | 2 +-
drivers/video/s3c-fb.c | 172 --------------------------------------------
3 files changed, 1 insertion(+), 174 deletions(-)
delete mode 100644 drivers/video/s3c-fb.c
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 6bb9e28..412c948 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -48,7 +48,6 @@ obj-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o
obj-$(CONFIG_VIDEO_MVEBU) += mvebu_lcd.o
obj-$(CONFIG_VIDEO_MXS) += mxsfb.o videomodes.o
obj-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o
-obj-$(CONFIG_VIDEO_S3C) += s3c-fb.o videomodes.o
obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o
obj-$(CONFIG_VIDEO_SED13806) += sed13806.o
obj-$(CONFIG_VIDEO_SM501) += sm501.o
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index a087d2e..aca4444 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -104,7 +104,7 @@
#define VIDEO_HW_BITBLT
#endif
-#if defined(CONFIG_VIDEO_MXS) || defined(CONFIG_VIDEO_S3C)
+#if defined(CONFIG_VIDEO_MXS)
#define VIDEO_FB_16BPP_WORD_SWAP
#endif
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
deleted file mode 100644
index bea3e69..0000000
--- a/drivers/video/s3c-fb.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * S3C24x0 LCD driver
- *
- * NOTE: Only 16/24 bpp operation with TFT LCD is supported.
- *
- * Copyright (C) 2014 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-#include <common.h>
-#include <malloc.h>
-#include <video_fb.h>
-
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <asm/arch/s3c24x0_cpu.h>
-
-#include "videomodes.h"
-
-static GraphicDevice panel;
-
-/* S3C requires the FB to be 4MiB aligned. */
-#define S3CFB_ALIGN (4 << 20)
-
-#define S3CFB_LCDCON1_CLKVAL(x) ((x) << 8)
-#define S3CFB_LCDCON1_PNRMODE_TFT (0x3 << 5)
-#define S3CFB_LCDCON1_BPPMODE_TFT_16BPP (0xc << 1)
-#define S3CFB_LCDCON1_BPPMODE_TFT_24BPP (0xd << 1)
-
-#define S3CFB_LCDCON2_VBPD(x) ((x) << 24)
-#define S3CFB_LCDCON2_LINEVAL(x) ((x) << 14)
-#define S3CFB_LCDCON2_VFPD(x) ((x) << 6)
-#define S3CFB_LCDCON2_VSPW(x) ((x) << 0)
-
-#define S3CFB_LCDCON3_HBPD(x) ((x) << 19)
-#define S3CFB_LCDCON3_HOZVAL(x) ((x) << 8)
-#define S3CFB_LCDCON3_HFPD(x) ((x) << 0)
-
-#define S3CFB_LCDCON4_HSPW(x) ((x) << 0)
-
-#define S3CFB_LCDCON5_BPP24BL (1 << 12)
-#define S3CFB_LCDCON5_FRM565 (1 << 11)
-#define S3CFB_LCDCON5_HWSWP (1 << 0)
-
-#define PS2KHZ(ps) (1000000000UL / (ps))
-
-/*
- * Example:
- * setenv videomode video=ctfb:x:800,y:480,depth:16,mode:0,\
- * pclk:30066,le:41,ri:89,up:45,lo:12,
- * hs:1,vs:1,sync:100663296,vmode:0
- */
-static void s3c_lcd_init(GraphicDevice *panel,
- struct ctfb_res_modes *mode, int bpp)
-{
- uint32_t clk_divider;
- struct s3c24x0_lcd *regs = s3c24x0_get_base_lcd();
-
- /* Stop the controller. */
- clrbits_le32(®s->lcdcon1, 1);
-
- /* Calculate clock divider. */
- clk_divider = (get_HCLK() / PS2KHZ(mode->pixclock)) / 1000;
- clk_divider = DIV_ROUND_UP(clk_divider, 2);
- if (clk_divider)
- clk_divider -= 1;
-
- /* Program LCD configuration. */
- switch (bpp) {
- case 16:
- writel(S3CFB_LCDCON1_BPPMODE_TFT_16BPP |
- S3CFB_LCDCON1_PNRMODE_TFT |
- S3CFB_LCDCON1_CLKVAL(clk_divider),
- ®s->lcdcon1);
- writel(S3CFB_LCDCON5_HWSWP | S3CFB_LCDCON5_FRM565,
- ®s->lcdcon5);
- break;
- case 24:
- writel(S3CFB_LCDCON1_BPPMODE_TFT_24BPP |
- S3CFB_LCDCON1_PNRMODE_TFT |
- S3CFB_LCDCON1_CLKVAL(clk_divider),
- ®s->lcdcon1);
- writel(S3CFB_LCDCON5_BPP24BL, ®s->lcdcon5);
- break;
- }
-
- writel(S3CFB_LCDCON2_LINEVAL(mode->yres - 1) |
- S3CFB_LCDCON2_VBPD(mode->upper_margin - 1) |
- S3CFB_LCDCON2_VFPD(mode->lower_margin - 1) |
- S3CFB_LCDCON2_VSPW(mode->vsync_len - 1),
- ®s->lcdcon2);
-
- writel(S3CFB_LCDCON3_HBPD(mode->right_margin - 1) |
- S3CFB_LCDCON3_HFPD(mode->left_margin - 1) |
- S3CFB_LCDCON3_HOZVAL(mode->xres - 1),
- ®s->lcdcon3);
-
- writel(S3CFB_LCDCON4_HSPW(mode->hsync_len - 1),
- ®s->lcdcon4);
-
- /* Write FB address. */
- writel(panel->frameAdrs >> 1, ®s->lcdsaddr1);
- writel((panel->frameAdrs +
- (mode->xres * mode->yres * panel->gdfBytesPP)) >> 1,
- ®s->lcdsaddr2);
- writel(mode->xres * bpp / 16, ®s->lcdsaddr3);
-
- /* Start the controller. */
- setbits_le32(®s->lcdcon1, 1);
-}
-
-void *video_hw_init(void)
-{
- int bpp = -1;
- char *penv;
- void *fb;
- struct ctfb_res_modes mode;
-
- puts("Video: ");
-
- /* Suck display configuration from "videomode" variable */
- penv = getenv("videomode");
- if (!penv) {
- puts("S3CFB: 'videomode' variable not set!\n");
- return NULL;
- }
-
- bpp = video_get_params(&mode, penv);
-
- /* fill in Graphic device struct */
- sprintf(panel.modeIdent, "%dx%dx%d", mode.xres, mode.yres, bpp);
-
- panel.winSizeX = mode.xres;
- panel.winSizeY = mode.yres;
- panel.plnSizeX = mode.xres;
- panel.plnSizeY = mode.yres;
-
- switch (bpp) {
- case 24:
- panel.gdfBytesPP = 4;
- panel.gdfIndex = GDF_32BIT_X888RGB;
- break;
- case 16:
- panel.gdfBytesPP = 2;
- panel.gdfIndex = GDF_16BIT_565RGB;
- break;
- default:
- printf("S3CFB: Invalid BPP specified! (bpp = %i)\n", bpp);
- return NULL;
- }
-
- panel.memSize = mode.xres * mode.yres * panel.gdfBytesPP;
-
- /* Allocate framebuffer */
- fb = memalign(S3CFB_ALIGN, roundup(panel.memSize, S3CFB_ALIGN));
- if (!fb) {
- printf("S3CFB: Error allocating framebuffer!\n");
- return NULL;
- }
-
- /* Wipe framebuffer */
- memset(fb, 0, panel.memSize);
-
- panel.frameAdrs = (u32)fb;
-
- printf("%s\n", panel.modeIdent);
-
- /* Start framebuffer */
- s3c_lcd_init(&panel, &mode, bpp);
-
- return (void *)&panel;
-}
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 15/29] video: Drop the sed13806 driver
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (13 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 14/29] video: Drop the s3c-fb driver Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:06 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig Simon Glass
` (14 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This is not used in U-Boot.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
README | 5 -
drivers/video/Makefile | 1 -
drivers/video/cfb_console.c | 9 --
drivers/video/sed13806.c | 286 -------------------------------------------
include/sed13806.h | 81 ------------
scripts/config_whitelist.txt | 1 -
6 files changed, 383 deletions(-)
delete mode 100644 drivers/video/sed13806.c
delete mode 100644 include/sed13806.h
diff --git a/README b/README
index cab4ebb..6367fdd 100644
--- a/README
+++ b/README
@@ -1665,11 +1665,6 @@ CBFS (Coreboot Filesystem) support
instead.
- Video support:
- CONFIG_VIDEO_SED13806
- Enable Epson SED13806 driver. This driver supports 8bpp
- and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP
- or CONFIG_VIDEO_SED13806_16BPP
-
CONFIG_FSL_DIU_FB
Enable the Freescale DIU video driver. Reference boards for
SOCs that have a DIU should define this macro to enable DIU
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 412c948..ff3617b 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_VIDEO_MVEBU) += mvebu_lcd.o
obj-$(CONFIG_VIDEO_MXS) += mxsfb.o videomodes.o
obj-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o
obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o
-obj-$(CONFIG_VIDEO_SED13806) += sed13806.o
obj-$(CONFIG_VIDEO_SM501) += sm501.o
obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o videomodes.o
obj-$(CONFIG_VIDEO_TEGRA20) += tegra.o
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index aca4444..ac7c402 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -95,15 +95,6 @@
#define VIDEO_HW_BITBLT
#endif
-/*
- * Defines for the SED13806 driver
- */
-#ifdef CONFIG_VIDEO_SED13806
-#define VIDEO_FB_LITTLE_ENDIAN
-#define VIDEO_HW_RECTFILL
-#define VIDEO_HW_BITBLT
-#endif
-
#if defined(CONFIG_VIDEO_MXS)
#define VIDEO_FB_16BPP_WORD_SWAP
#endif
diff --git a/drivers/video/sed13806.c b/drivers/video/sed13806.c
deleted file mode 100644
index cd7fac6..0000000
--- a/drivers/video/sed13806.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * (C) Copyright 2002
- * St?ubli Faverges - <www.staubli.com>
- * Pierre AUBERT p.aubert at staubli.com
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-/* Video support for Epson SED13806 chipset */
-
-#include <common.h>
-
-#include <video_fb.h>
-#include <sed13806.h>
-
-#define readByte(ptrReg) \
- *(volatile unsigned char *)(sed13806.isaBase + ptrReg)
-
-#define writeByte(ptrReg,value) \
- *(volatile unsigned char *)(sed13806.isaBase + ptrReg) = value
-
-#define writeWord(ptrReg,value) \
- (*(volatile unsigned short *)(sed13806.isaBase + ptrReg) = ((value >> 8 ) & 0xff) | ((value << 8) & 0xff00))
-
-GraphicDevice sed13806;
-
-/*-----------------------------------------------------------------------------
- * EpsonSetRegs --
- *-----------------------------------------------------------------------------
- */
-static void EpsonSetRegs (void)
-{
- /* the content of the chipset register depends on the board (clocks, ...)*/
- const S1D_REGS *preg = board_get_regs ();
- while (preg -> Index) {
- writeByte (preg -> Index, preg -> Value);
- preg ++;
- }
-}
-
-/*-----------------------------------------------------------------------------
- * video_hw_init --
- *-----------------------------------------------------------------------------
- */
-void *video_hw_init (void)
-{
- unsigned int *vm, i;
-
- memset (&sed13806, 0, sizeof (GraphicDevice));
-
- /* Initialization of the access to the graphic chipset
- Retreive base address of the chipset
- (see board/RPXClassic/eccx.c) */
- if ((sed13806.isaBase = board_video_init ()) == 0) {
- return (NULL);
- }
-
- sed13806.frameAdrs = sed13806.isaBase + FRAME_BUFFER_OFFSET;
- sed13806.winSizeX = board_get_width ();
- sed13806.winSizeY = board_get_height ();
-
-#if defined(CONFIG_VIDEO_SED13806_8BPP)
- sed13806.gdfIndex = GDF__8BIT_INDEX;
- sed13806.gdfBytesPP = 1;
-
-#elif defined(CONFIG_VIDEO_SED13806_16BPP)
- sed13806.gdfIndex = GDF_16BIT_565RGB;
- sed13806.gdfBytesPP = 2;
-
-#else
-#error Unsupported SED13806 BPP
-#endif
-
- sed13806.memSize = sed13806.winSizeX * sed13806.winSizeY * sed13806.gdfBytesPP;
-
- /* Load SED registers */
- EpsonSetRegs ();
-
- /* (see board/RPXClassic/RPXClassic.c) */
- board_validate_screen (sed13806.isaBase);
-
- /* Clear video memory */
- i = sed13806.memSize/4;
- vm = (unsigned int *)sed13806.frameAdrs;
- while(i--)
- *vm++ = 0;
-
-
- return (&sed13806);
-}
-/*-----------------------------------------------------------------------------
- * Epson_wait_idle -- Wait for hardware to become idle
- *-----------------------------------------------------------------------------
- */
-static void Epson_wait_idle (void)
-{
- while (readByte (BLT_CTRL0) & 0x80);
-
- /* Read a word in the BitBLT memory area to shutdown the BitBLT engine */
- *(volatile unsigned short *)(sed13806.isaBase + BLT_REG);
-}
-
-/*-----------------------------------------------------------------------------
- * video_hw_bitblt --
- *-----------------------------------------------------------------------------
- */
-void video_hw_bitblt (
- unsigned int bpp, /* bytes per pixel */
- unsigned int src_x, /* source pos x */
- unsigned int src_y, /* source pos y */
- unsigned int dst_x, /* dest pos x */
- unsigned int dst_y, /* dest pos y */
- unsigned int dim_x, /* frame width */
- unsigned int dim_y /* frame height */
- )
-{
- register GraphicDevice *pGD = (GraphicDevice *)&sed13806;
- unsigned long srcAddr, dstAddr;
- unsigned int stride = bpp * pGD -> winSizeX;
-
- srcAddr = (src_y * stride) + (src_x * bpp);
- dstAddr = (dst_y * stride) + (dst_x * bpp);
-
- Epson_wait_idle ();
-
- writeByte(BLT_ROP,0x0C); /* source */
- writeByte(BLT_OP,0x02);/* move blit in positive direction with ROP */
- writeWord(BLT_MEM_OFF0, stride / 2);
- if (pGD -> gdfIndex == GDF__8BIT_INDEX) {
- writeByte(BLT_CTRL1,0x00);
- }
- else {
- writeByte(BLT_CTRL1,0x01);
- }
-
- writeWord(BLT_WIDTH0,(dim_x - 1));
- writeWord(BLT_HEIGHT0,(dim_y - 1));
-
- /* set up blit registers */
- writeByte(BLT_SRC_ADDR0,srcAddr);
- writeByte(BLT_SRC_ADDR1,srcAddr>>8);
- writeByte(BLT_SRC_ADDR2,srcAddr>>16);
-
- writeByte(BLT_DST_ADDR0,dstAddr);
- writeByte(BLT_DST_ADDR1,dstAddr>>8);
- writeByte(BLT_DST_ADDR2,dstAddr>>16);
-
- /* Engage the blt engine */
- /* rectangular region for src and dst */
- writeByte(BLT_CTRL0,0x80);
-
- /* wait untill current blits finished */
- Epson_wait_idle ();
-}
-/*-----------------------------------------------------------------------------
- * video_hw_rectfill --
- *-----------------------------------------------------------------------------
- */
-void video_hw_rectfill (
- unsigned int bpp, /* bytes per pixel */
- unsigned int dst_x, /* dest pos x */
- unsigned int dst_y, /* dest pos y */
- unsigned int dim_x, /* frame width */
- unsigned int dim_y, /* frame height */
- unsigned int color /* fill color */
- )
-{
- register GraphicDevice *pGD = (GraphicDevice *)&sed13806;
- unsigned long dstAddr;
- unsigned int stride = bpp * pGD -> winSizeX;
-
- dstAddr = (dst_y * stride) + (dst_x * bpp);
-
- Epson_wait_idle ();
-
- /* set up blit registers */
- writeByte(BLT_DST_ADDR0,dstAddr);
- writeByte(BLT_DST_ADDR1,dstAddr>>8);
- writeByte(BLT_DST_ADDR2,dstAddr>>16);
-
- writeWord(BLT_WIDTH0,(dim_x - 1));
- writeWord(BLT_HEIGHT0,(dim_y - 1));
- writeWord(BLT_FGCOLOR0,color);
-
- writeByte(BLT_OP,0x0C); /* solid fill */
- writeWord(BLT_MEM_OFF0,stride / 2);
-
- if (pGD -> gdfIndex == GDF__8BIT_INDEX) {
- writeByte(BLT_CTRL1,0x00);
- }
- else {
- writeByte(BLT_CTRL1,0x01);
- }
-
- /* Engage the blt engine */
- /* rectangular region for src and dst */
- writeByte(BLT_CTRL0,0x80);
-
- /* wait untill current blits finished */
- Epson_wait_idle ();
-}
-
-/*-----------------------------------------------------------------------------
- * video_set_lut --
- *-----------------------------------------------------------------------------
- */
-void video_set_lut (
- unsigned int index, /* color number */
- unsigned char r, /* red */
- unsigned char g, /* green */
- unsigned char b /* blue */
- )
-{
- writeByte(REG_LUT_ADDR, index );
- writeByte(REG_LUT_DATA, r);
- writeByte(REG_LUT_DATA, g);
- writeByte(REG_LUT_DATA, b);
-}
-#ifdef CONFIG_VIDEO_HW_CURSOR
-/*-----------------------------------------------------------------------------
- * video_set_hw_cursor --
- *-----------------------------------------------------------------------------
- */
-void video_set_hw_cursor (int x, int y)
-{
- writeByte (LCD_CURSOR_XL, (x & 0xff));
- writeByte (LCD_CURSOR_XM, (x >> 8));
- writeByte (LCD_CURSOR_YL, (y & 0xff));
- writeByte (LCD_CURSOR_YM, (y >> 8));
-}
-
-/*-----------------------------------------------------------------------------
- * video_init_hw_cursor --
- *-----------------------------------------------------------------------------
- */
-void video_init_hw_cursor (int font_width, int font_height)
-{
- volatile unsigned char *ptr;
- unsigned char pattern;
- int i;
-
-
- /* Init cursor content
- Cursor size is 64x64 pixels
- Start of the cursor memory depends on panel type (dual panel ...) */
- if ((i = readByte (LCD_CURSOR_START)) == 0) {
- ptr = (unsigned char *)(sed13806.frameAdrs + DEFAULT_VIDEO_MEMORY_SIZE - HWCURSORSIZE);
- }
- else {
- ptr = (unsigned char *)(sed13806.frameAdrs + DEFAULT_VIDEO_MEMORY_SIZE - (i * 8192));
- }
-
- /* Fill the first line and the first empty line after cursor */
- for (i = 0, pattern = 0; i < 64; i++) {
- if (i < font_width) {
- /* Invert background */
- pattern |= 0x3;
-
- }
- else {
- /* Background */
- pattern |= 0x2;
- }
- if ((i & 3) == 3) {
- *ptr = pattern;
- *(ptr + font_height * 16) = 0xaa;
- ptr ++;
- pattern = 0;
- }
- pattern <<= 2;
- }
-
- /* Duplicate this line */
- for (i = 1; i < font_height; i++) {
- memcpy ((void *)ptr, (void *)(ptr - 16), 16);
- ptr += 16;
- }
-
- for (; i < 64; i++) {
- memcpy ((void *)(ptr + 16), (void *)ptr, 16);
- ptr += 16;
- }
-
- /* Select cursor mode */
- writeByte (LCD_CURSOR_CNTL, 1);
-}
-#endif
diff --git a/include/sed13806.h b/include/sed13806.h
deleted file mode 100644
index 1cb0b86..0000000
--- a/include/sed13806.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * (C) Copyright 2002
- * St?ubli Faverges - <www.staubli.com>
- * Pierre AUBERT p.aubert at staubli.com
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-/* Video support for Epson SED13806 chipset */
-
-
-#ifndef _SED13806_H_
-#define _SED13806_H_
-
-
-/* General definitions */
-#define FRAME_BUFFER_OFFSET 0x200000 /* Frame buffer offset */
-#define TOTAL_SPACE_SIZE 0x400000
-
-#define DEFAULT_VIDEO_MEMORY_SIZE 0x140000 /* Video Memory Size */
-
-#define HWCURSORSIZE 1024 /* Size of memory reserved
- for HW cursor*/
-
-/* Offset of chipset registers */
-#define BLT_CTRL0 (0x0100)
-#define BLT_CTRL1 (0x0101)
-#define BLT_ROP (0x0102)
-#define BLT_OP (0x0103)
-#define BLT_SRC_ADDR0 (0x0104)
-#define BLT_SRC_ADDR1 (0x0105)
-#define BLT_SRC_ADDR2 (0x0106)
-#define BLT_DST_ADDR0 (0x0108)
-#define BLT_DST_ADDR1 (0x0109)
-#define BLT_DST_ADDR2 (0x010A)
-#define BLT_MEM_OFF0 (0x010C)
-#define BLT_MEM_OFF1 (0x010D)
-#define BLT_WIDTH0 (0x0110)
-#define BLT_WIDTH1 (0x0111)
-#define BLT_HEIGHT0 (0x0112)
-#define BLT_HEIGHT1 (0x0113)
-#define BLT_BGCOLOR0 (0x0114)
-#define BLT_BGCOLOR1 (0x0115)
-#define BLT_FGCOLOR0 (0x0118)
-#define BLT_FGCOLOR1 (0x0119)
-
-#define BLT_REG (0x100000)
-
-/* Lookup table registers */
-#define REG_LUT_ADDR 0x1e2
-#define REG_LUT_DATA 0x1e4
-
-/* Cursor/Ink registers */
-#define LCD_CURSOR_CNTL (0x0070)
-#define LCD_CURSOR_START (0x0071)
-#define LCD_CURSOR_XL (0x0072)
-#define LCD_CURSOR_XM (0x0073)
-#define LCD_CURSOR_YL (0x0074)
-#define LCD_CURSOR_YM (0x0075)
-#define LCD_CURSOR_COL0_B (0x0076)
-#define LCD_CURSOR_COL0_G (0x0077)
-#define LCD_CURSOR_COL0_R (0x0078)
-#define LCD_CURSOR_COL1_B (0x007A)
-#define LCD_CURSOR_COL1_G (0x007B)
-#define LCD_CURSOR_COL1_R (0x007C)
-#define LCD_CURSOR_FIFO (0x007E)
-
-typedef struct
-{
- unsigned short Index;
- unsigned char Value;
-} S1D_REGS;
-
-
-/* Board specific functions */
-unsigned int board_video_init (void);
-void board_validate_screen (unsigned int base);
-const S1D_REGS *board_get_regs (void);
-int board_get_width (void);
-int board_get_height (void);
-
-#endif /* _SED13806_H_ */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e5a7331..06ac316 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8288,7 +8288,6 @@ CONFIG_VIDEO_MXS
CONFIG_VIDEO_MXS_MODE_SYSTEM
CONFIG_VIDEO_OMAP3
CONFIG_VIDEO_ONBOARD
-CONFIG_VIDEO_SED13806
CONFIG_VIDEO_SM501
CONFIG_VIDEO_SM501_16BPP
CONFIG_VIDEO_SM501_32BPP
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (14 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 15/29] video: Drop the sed13806 driver Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:07 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 17/29] video: Drop CONFIG_VIDEO_HW_CURSOR Simon Glass
` (13 subsequent siblings)
29 siblings, 2 replies; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_VGA_AS_SINGLE_DEVICE
Once we migrate to driver model for video, we should be able to drop this
option.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v3: None
Changes in v2: None
configs/Chuwi_V7_CW0825_defconfig | 1 +
configs/MSI_Primo81_defconfig | 1 +
configs/bayleybay_defconfig | 1 +
configs/chromebook_link_defconfig | 1 +
configs/chromebox_panther_defconfig | 1 +
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
configs/conga-qeval20-qa3-e3845_defconfig | 1 +
configs/crownbay_defconfig | 1 +
configs/dfi-bt700-q7x-151_defconfig | 1 +
configs/minnowmax_defconfig | 1 +
configs/qemu-x86_defconfig | 1 +
configs/qemu-x86_efi_payload32_defconfig | 1 +
configs/qemu-x86_efi_payload64_defconfig | 1 +
configs/som-db5800-som-6867_defconfig | 1 +
configs/theadorable-x86-dfi-bt700_defconfig | 1 +
configs/theadorable_debug_defconfig | 1 +
configs/theadorable_defconfig | 1 +
drivers/video/Kconfig | 10 ++++++++++
drivers/video/cfb_console.c | 6 ------
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/ac14xx.h | 4 ----
include/configs/advantech_dms-ba16.h | 1 -
include/configs/aria.h | 4 ----
include/configs/aristainetos-common.h | 1 -
include/configs/cgtqmx6eval.h | 1 -
include/configs/cm_fx6.h | 1 -
include/configs/colibri_imx7.h | 1 -
include/configs/controlcenterd.h | 1 -
include/configs/digsy_mtc.h | 1 -
include/configs/ea20.h | 1 -
include/configs/embestmx6boards.h | 1 -
include/configs/ge_bx50v3.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/m53evk.h | 1 -
include/configs/mcx.h | 1 -
include/configs/mpc5121ads.h | 1 -
include/configs/mt_ventoux.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/mxs.h | 1 -
include/configs/nitrogen6x.h | 1 -
include/configs/novena.h | 1 -
include/configs/pdm360ng.h | 1 -
include/configs/pxm2.h | 1 -
include/configs/rut.h | 1 -
include/configs/sequoia.h | 1 -
include/configs/socrates.h | 1 -
include/configs/sunxi-common.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/theadorable.h | 1 -
include/configs/wandboard.h | 1 -
include/configs/x86-common.h | 1 -
scripts/config_whitelist.txt | 1 -
76 files changed, 27 insertions(+), 70 deletions(-)
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index 8507f73..a67038b 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -22,3 +22,4 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_VIDEO_LCD_SPI_CS="PA0"
CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
+CONFIG_CFB_CONSOLE=y
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index 8847271..e9d5be4 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -25,3 +25,4 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9"
CONFIG_VIDEO_LCD_SPI_SCLK="PH10"
CONFIG_VIDEO_LCD_SPI_MOSI="PH11"
CONFIG_VIDEO_LCD_SPI_MISO="PH12"
+CONFIG_CFB_CONSOLE=y
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index aa4bfe0..6de6c1e 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -58,4 +58,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 39b4f73..2f35b77 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -62,5 +62,6 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_TPM=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 4e24d60..0d5aaa7 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -54,5 +54,6 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_TPM=y
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index e869bff..513f3c4 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -66,4 +66,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index bbad68e..cc6385b 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -65,4 +65,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 5d90bd2..a1587ef 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -51,4 +51,5 @@ CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 3ae2aa5..3c6b94f 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -63,4 +63,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index fc38642..65da516 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -62,4 +62,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 9bbbcd9..9bd9c1d 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -49,4 +49,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index 3dfc344..9374dde 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -46,6 +46,7 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index 87afb73..85dc3e9 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -46,6 +46,7 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 355f97f..bbdcbc0 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -60,4 +60,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index b110798..44f7b7c 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -60,4 +60,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 2596d78..51deddc 100644
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -50,3 +50,4 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_MVEBU=y
+CONFIG_CFB_CONSOLE=y
diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig
index dc39c18..9c7a79f 100644
--- a/configs/theadorable_defconfig
+++ b/configs/theadorable_defconfig
@@ -40,5 +40,6 @@ CONFIG_DEBUG_UART_CLOCK=250000000
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y
CONFIG_VIDEO_MVEBU=y
+CONFIG_CFB_CONSOLE=y
CONFIG_REGEX=y
CONFIG_LIB_RAND=y
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2150830..2c5ef2b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -472,6 +472,16 @@ config CFB_CONSOLE_ANSI
erase functions and limited graphics rendition control). Normal
output from U-Boot will pass through this filter.
+config VGA_AS_SINGLE_DEVICE
+ bool "Set the video as an output-only device"
+ depends on CFB_CONSOLE
+ default y
+ help
+ If enable the framebuffer device will be initialized as an
+ output-only device. The Keyboard driver will not be set up. This
+ may be used if you have no keyboard device, or more than one
+ (USB Keyboard, AT Keyboard).
+
config VIDEO_CT69000
bool "Enable Chips & Technologies 69000 video driver"
depends on VIDEO
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index ac7c402..3a8e20b 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -58,12 +58,6 @@
* info);
* that fills a info buffer at i=row.
* s.a: board/eltec/bab7xx.
- * CONFIG_VGA_AS_SINGLE_DEVICE - If set the framebuffer device will be
- * initialized as an output only device.
- * The Keyboard driver will not be
- * set-up. This may be used, if you have
- * no or more than one Keyboard devices
- * (USB Keyboard, AT Keyboard).
*
* CONFIG_VIDEO_SW_CURSOR: - Draws a cursor after the last
* character. No blinking is provided.
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 501411b..0fc3131 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -344,7 +344,6 @@
************************************************************/
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_SW_CURSOR
#undef CONFIG_VIDEO_ONBOARD
/************************************************************
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index e4fec53..0900540 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -508,7 +508,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_VIRT
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 23e8de4..76eb674 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -281,7 +281,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 1571c8a..3f43d75 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -468,7 +468,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 699293c..c5295f9 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x2c000)
#define CONFIG_CMD_BMP
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#endif
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index ce4e33f..37dd44e 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -381,7 +381,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE2_IO_VIRT
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index c4e3e65..e391088 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -382,7 +382,6 @@
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000)
#define CONFIG_CMD_BMP
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
@@ -403,7 +402,6 @@
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#endif
/* I2C */
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 54dbe4c..2b3cf19 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -304,7 +304,6 @@
************************************************************/
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_ONBOARD /* Video controller is on-board */
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index d8a53bc..1c18495 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -503,7 +503,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index d8792d6..9b0b917 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -501,7 +501,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index af63dd3..2ae6573 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -415,7 +415,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index cf59eb7..4b5e451 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -485,7 +485,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#endif
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 9ecc363..c5705f5 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -108,7 +108,6 @@
#define CONFIG_VIDEO_BMP_LOGO
#endif
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#endif /* #ifndef CONFIG_TQM5200S */
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index f1013c4..2f3668a 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -32,10 +32,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFF00000
-#if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#endif
-
#define CONFIG_SYS_MPC512X_CLKIN 25000000 /* in Hz */
#define SCFR1_IPS_DIV 2
#define SCFR1_LPC_DIV 2
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 840e3d9..2cbbac2 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -276,7 +276,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/aria.h b/include/configs/aria.h
index 7b7e6e2..d7b043c 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -39,10 +39,6 @@
/* video */
-#if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#endif
-
/* CONFIG_PCI is defined at config time */
#define CONFIG_SYS_MPC512X_CLKIN 33000000 /* in Hz */
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 0ec5732..93083fc 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -231,7 +231,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
/* check this console not needed, after test remove it */
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 1c76b5e..b016f20 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -89,7 +89,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 55a5f93..bb036dc 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -256,7 +256,6 @@
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index d523af8..ded26f9 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -227,7 +227,6 @@
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_CMD_BMP
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 47a3002..6770bd0 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -225,7 +225,6 @@
*/
#define CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CMD_BMP
/*
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index b90554f..2551de4 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -81,7 +81,6 @@
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index d3ca706..8c35688 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -102,7 +102,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_CONSOLE_INFO_QUIET
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index e115fd5..9e0c945 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -118,7 +118,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 3baac67..c1053f8 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -307,7 +307,6 @@
/* Framebuffer */
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index fa3a7286..d3bc836 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -181,7 +181,6 @@
/* Framebuffer and LCD */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_CMD_HDMIDETECT
diff --git a/include/configs/icon.h b/include/configs/icon.h
index f858b99..c38a254 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -134,7 +134,6 @@
#define VIDEO_FB_LITTLE_ENDIAN
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 5a20437..f833f7d 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -184,7 +184,6 @@
#define CONFIG_VIDEO_MX3
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_CMD_BMP
#define CONFIG_BMP_16BPP
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 99200d1..436bc75 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -51,7 +51,6 @@
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_GZIP
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index a19f206..99a7979 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -451,7 +451,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_FSL_DCU_FB
#define CONFIG_CMD_BMP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 3c596f3..d1e01fe 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -332,7 +332,6 @@
#ifdef CONFIG_FSL_DCU_FB
#define CONFIG_CMD_BMP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 58446b5..d812e66 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -360,7 +360,6 @@
#define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 3913fcd..07031e5 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -201,7 +201,6 @@
*/
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 25ab0c9..00cbe63 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -371,7 +371,6 @@
#define CONFIG_NET_RETRY_COUNT 10
#endif
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_CMD_BMP
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index ac3ac35..50a6ccd 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -39,7 +39,6 @@
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR + 0x2100)
#define CONFIG_CMD_BMP
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#endif
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 3ec2358..2420612 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -51,7 +51,6 @@
#define CONFIG_FPGA_DELAY() udelay(1)
#define CONFIG_SYS_FPGA_PROG_FEEDBACK
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_CMD_BMP
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 4ecd7fd..968662d 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -97,7 +97,6 @@
/* Framebuffer and LCD */
#define CONFIG_PREBOOT
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 89e5557..258a856 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -216,7 +216,6 @@
/* Framebuffer and LCD */
#define CONFIG_PREBOOT
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 158858f..82957d6 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -35,7 +35,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index fb380ba..9a0b0a2 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -209,7 +209,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index e288ad8..b45ad72 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -209,7 +209,6 @@
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_CMD_BMP
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index c9ca034..8002796 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -232,7 +232,6 @@
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_CMD_BMP
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index da75d03..bf0cb2e 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -256,7 +256,6 @@
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_CMD_BMP
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 52083c8..33459d7 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -145,7 +145,6 @@
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#endif
/* MMC */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index d18c177..63ef4e7 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -93,7 +93,6 @@
/* Framebuffer and LCD */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 40194f0..0983b96 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -161,7 +161,6 @@
/* Video output */
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_BMP_16BPP
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index acadf72..f5fcef8 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -41,7 +41,6 @@
/* Video */
#if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 6cc8d6c..2aa184a 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -126,7 +126,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 11f9a25..3d7b85f 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -120,7 +120,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_VIDEO_LOGO
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index facfdac..153646f 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -411,7 +411,6 @@
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_SPLASH_SCREEN
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CMD_BMP
#endif
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 5abdd23..9d92a06 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -176,7 +176,6 @@
#define CONFIG_CONSOLE_EXTRA_INFO
#define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_GZIP
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 78333c6..3b9c688 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -298,7 +298,6 @@ extern int soft_i2c_gpio_scl;
/* allow both serial and cfb console. */
/* stop x86 thinking in cfbconsole from trying to init a pc keyboard */
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#endif /* CONFIG_VIDEO */
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 340ae9c..da1dea8 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -75,7 +75,6 @@
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 365019a..fe2ca6f 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -96,7 +96,6 @@
/* Enable LCD and reserve 512KB from top of memory*/
#define CONFIG_SYS_MEM_TOP_HIDE 0x80000
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CMD_BMP
/* FPGA programming support */
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index aacf4ef..4d219e2 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -75,7 +75,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 7633a43..c1f6b91 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -131,7 +131,6 @@
*/
#define CONFIG_VIDEO_SW_CURSOR
#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CONSOLE_SCROLL_LINES 5
/*-----------------------------------------------------------------------
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 06ac316..3bc1b09 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8267,7 +8267,6 @@ CONFIG_VERY_BIG_RAM
CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
CONFIG_VF610
-CONFIG_VGA_AS_SINGLE_DEVICE
CONFIG_VID
CONFIG_VIDEO_BCM2835
CONFIG_VIDEO_BMP_GZIP
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 17/29] video: Drop CONFIG_VIDEO_HW_CURSOR
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (15 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:08 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 18/29] Convert CONFIG_VIDEO_SW_CURSOR to Kconfig Simon Glass
` (12 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This is not used in U-Boot.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
drivers/video/cfb_console.c | 33 +-----------------
drivers/video/ct69000.c | 79 --------------------------------------------
include/video_fb.h | 4 ---
scripts/config_whitelist.txt | 1 -
4 files changed, 1 insertion(+), 116 deletions(-)
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 3a8e20b..a99fc00 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -63,14 +63,6 @@
* character. No blinking is provided.
* Uses the macros CURSOR_SET and
* CURSOR_OFF.
- *
- * CONFIG_VIDEO_HW_CURSOR: - Uses the hardware cursor capability
- * of the graphic chip. Uses the macro
- * CURSOR_SET. ATTENTION: If booting an
- * OS, the display driver must disable
- * the hardware register of the graphic
- * chip. Otherwise a blinking field is
- * displayed.
*/
#include <common.h>
@@ -154,13 +146,8 @@
* CONFIG_VIDEO_SW_CURSOR: Draws a cursor after the last character. No
* blinking is provided. Uses the macros CURSOR_SET
* and CURSOR_OFF.
- * CONFIG_VIDEO_HW_CURSOR: Uses the hardware cursor capability of the
- * graphic chip. Uses the macro CURSOR_SET.
- * ATTENTION: If booting an OS, the display driver
- * must disable the hardware register of the graphic
- * chip. Otherwise a blinking field is displayed
*/
-#if !defined(CONFIG_VIDEO_SW_CURSOR) && !defined(CONFIG_VIDEO_HW_CURSOR)
+#if !defined(CONFIG_VIDEO_SW_CURSOR)
/* no Cursor defined */
#define CURSOR_ON
#define CURSOR_OFF
@@ -168,10 +155,6 @@
#endif
#if defined(CONFIG_VIDEO_SW_CURSOR)
-#if defined(CONFIG_VIDEO_HW_CURSOR)
-#error only one of CONFIG_VIDEO_SW_CURSOR or CONFIG_VIDEO_HW_CURSOR can be \
- defined
-#endif
void console_cursor(int state);
#define CURSOR_ON console_cursor(1)
@@ -179,17 +162,6 @@ void console_cursor(int state);
#define CURSOR_SET video_set_cursor()
#endif /* CONFIG_VIDEO_SW_CURSOR */
-#ifdef CONFIG_VIDEO_HW_CURSOR
-#ifdef CURSOR_ON
-#error only one of CONFIG_VIDEO_SW_CURSOR or CONFIG_VIDEO_HW_CURSOR can be \
- defined
-#endif
-#define CURSOR_ON
-#define CURSOR_OFF
-#define CURSOR_SET video_set_hw_cursor(console_col * VIDEO_FONT_WIDTH, \
- (console_row * VIDEO_FONT_HEIGHT) + video_logo_height)
-#endif /* CONFIG_VIDEO_HW_CURSOR */
-
#ifdef CONFIG_VIDEO_LOGO
#ifdef CONFIG_VIDEO_BMP_LOGO
#include <bmp_logo.h>
@@ -2056,9 +2028,6 @@ static int video_init(void)
return -1;
video_fb_address = (void *) VIDEO_FB_ADRS;
-#ifdef CONFIG_VIDEO_HW_CURSOR
- video_init_hw_cursor(VIDEO_FONT_WIDTH, VIDEO_FONT_HEIGHT);
-#endif
cfb_do_flush_cache = cfb_fb_is_in_dram() && dcache_status();
diff --git a/drivers/video/ct69000.c b/drivers/video/ct69000.c
index 349da5e..a74e4e6 100644
--- a/drivers/video/ct69000.c
+++ b/drivers/video/ct69000.c
@@ -804,85 +804,6 @@ video_dump_reg (void)
#endif
-#ifdef CONFIG_VIDEO_HW_CURSOR
-/***************************************************************
- * Set Hardware Cursor in Pixel
- */
-void
-video_set_hw_cursor (int x, int y)
-{
- int sig_x = 0, sig_y = 0;
- if (x < 0) {
- x *= -1;
- sig_x = 1;
- }
- if (y < 0) {
- y *= -1;
- sig_y = 1;
- }
- ctWrite_i (CT_XR_O, 0xa4, x & 0xff);
- ctWrite_i (CT_XR_O, 0xa5, (x >> 8) & 0x7);
- ctWrite_i (CT_XR_O, 0xa6, y & 0xff);
- ctWrite_i (CT_XR_O, 0xa7, (y >> 8) & 0x7);
-}
-
-/***************************************************************
- * Init Hardware Cursor. To know the size of the Cursor,
- * we have to know the Font size.
- */
-void
-video_init_hw_cursor (int font_width, int font_height)
-{
- unsigned char xr_80;
- unsigned long *curs, pattern;
- int i;
- int cursor_start;
- GraphicDevice *pGD = (GraphicDevice *) & ctfb;
-
- cursor_start = pGD->dprBase;
- xr_80 = ctRead_i (CT_XR_O, 0x80);
- /* set start address */
- ctWrite_i (CT_XR_O, 0xa2, (cursor_start >> 8) & 0xf0);
- ctWrite_i (CT_XR_O, 0xa3, (cursor_start >> 16) & 0x3f);
- /* set cursor shape */
- curs = (unsigned long *) cursor_start;
- i = 0;
- while (i < 0x400) {
- curs[i++] = 0xffffffff; /* AND mask */
- curs[i++] = 0xffffffff; /* AND mask */
- curs[i++] = 0; /* XOR mask */
- curs[i++] = 0; /* XOR mask */
- /* Transparent */
- }
- pattern = 0xffffffff >> font_width;
- i = 0;
- while (i < (font_height * 2)) {
- curs[i++] = pattern; /* AND mask */
- curs[i++] = pattern; /* AND mask */
- curs[i++] = 0; /* XOR mask */
- curs[i++] = 0; /* XOR mask */
- /* Cursor Color 0 */
- }
- /* set blink rate */
- ctWrite_i (CT_FP_O, 0x19, 0xf);
-
- /* set cursors colors */
- xr_80 = ctRead_i (CT_XR_O, 0x80);
- xr_80 |= 0x1; /* alternate palette select */
- ctWrite_i (CT_XR_O, 0x80, xr_80);
- video_set_lut(4, CONFIG_SYS_CONSOLE_FG_COL, CONFIG_SYS_CONSOLE_FG_COL,
- CONFIG_SYS_CONSOLE_FG_COL);
- /* position 4 is color 0 cursor 0 */
- xr_80 &= 0xfe; /* normal palette select */
- ctWrite_i (CT_XR_O, 0x80, xr_80);
- /* cursor enable */
- ctWrite_i (CT_XR_O, 0xa0, 0x91);
- xr_80 |= 0x10; /* enable hwcursor */
- ctWrite_i (CT_XR_O, 0x80, xr_80);
- video_set_hw_cursor (0, 0);
-}
-#endif /* CONFIG_VIDEO_HW_CURSOR */
-
/***************************************************************
* Wait for BitBlt ready
*/
diff --git a/include/video_fb.h b/include/video_fb.h
index b7e3aee..b008853 100644
--- a/include/video_fb.h
+++ b/include/video_fb.h
@@ -88,9 +88,5 @@ void video_set_lut (
unsigned char g, /* green */
unsigned char b /* blue */
);
-#ifdef CONFIG_VIDEO_HW_CURSOR
-void video_set_hw_cursor(int x, int y); /* x y in pixel */
-void video_init_hw_cursor(int font_width, int font_height);
-#endif
#endif /*_VIDEO_FB_H_ */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3bc1b09..9d66e6a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8276,7 +8276,6 @@ CONFIG_VIDEO_CORALP
CONFIG_VIDEO_DA8XX
CONFIG_VIDEO_DT_SIMPLEFB
CONFIG_VIDEO_FONT_4X6
-CONFIG_VIDEO_HW_CURSOR
CONFIG_VIDEO_IPUV3
CONFIG_VIDEO_LCD_I2C_BUS
CONFIG_VIDEO_LOGO
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 18/29] Convert CONFIG_VIDEO_SW_CURSOR to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (16 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 17/29] video: Drop CONFIG_VIDEO_HW_CURSOR Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:11 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 19/29] video: Drop CONFIG_VIDEO_SW_CURSOR Simon Glass
` (11 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_VIDEO_SW_CURSOR
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
drivers/video/Kconfig | 10 ++++++++++
drivers/video/cfb_console.c | 6 ------
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/cm_fx6.h | 1 -
include/configs/colibri_imx7.h | 1 -
include/configs/digsy_mtc.h | 1 -
include/configs/icon.h | 1 -
include/configs/imx31_phycore.h | 1 -
include/configs/ipek01.h | 1 -
include/configs/lwmon5.h | 1 -
include/configs/mpc5121ads.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/nokia_rx51.h | 1 -
include/configs/sequoia.h | 1 -
include/configs/socrates.h | 1 -
include/configs/sunxi-common.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/x86-common.h | 1 -
scripts/config_whitelist.txt | 1 -
34 files changed, 10 insertions(+), 39 deletions(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2c5ef2b..4caa92a 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -482,6 +482,16 @@ config VGA_AS_SINGLE_DEVICE
may be used if you have no keyboard device, or more than one
(USB Keyboard, AT Keyboard).
+config VIDEO_SW_CURSOR
+ bool "Enable a software cursor"
+ depends on CFB_CONSOLE
+ default y if CFB_CONSOLE
+ help
+ This draws a cursor after the last character. No blinking is
+ provided. This makes it possible to see the current cursor
+ position when entering text on the console. It is recommended to
+ enable this.
+
config VIDEO_CT69000
bool "Enable Chips & Technologies 69000 video driver"
depends on VIDEO
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index a99fc00..56d3c15 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -141,12 +141,6 @@
#include <splash.h>
#endif
-/*
- * Cursor definition:
- * CONFIG_VIDEO_SW_CURSOR: Draws a cursor after the last character. No
- * blinking is provided. Uses the macros CURSOR_SET
- * and CURSOR_OFF.
- */
#if !defined(CONFIG_VIDEO_SW_CURSOR)
/* no Cursor defined */
#define CURSOR_ON
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 0fc3131..257fa47 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -344,7 +344,6 @@
************************************************************/
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VIDEO_SW_CURSOR
#undef CONFIG_VIDEO_ONBOARD
/************************************************************
* USB support EXPERIMENTAL
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 0900540..cba393a 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -507,7 +507,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_VIRT
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 76eb674..c3d69cb 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -280,7 +280,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 3f43d75..509728c 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -467,7 +467,6 @@
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index c5295f9..7882b35 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -26,7 +26,6 @@
#ifdef CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x2c000)
#define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#endif
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 37dd44e..2c15f3d 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -380,7 +380,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#if defined(CONFIG_VIDEO)
#define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE2_IO_VIRT
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index e391088..347a88d 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -381,7 +381,6 @@
#ifdef CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000)
#define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
@@ -398,7 +397,6 @@
#ifdef CONFIG_ATI
#define VIDEO_IO_OFFSET CONFIG_SYS_PCIE1_IO_VIRT
#define CONFIG_BIOSEMU
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_ATI_RADEON_FB
#define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 2b3cf19..70e75c1 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -304,7 +304,6 @@
************************************************************/
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_ONBOARD /* Video controller is on-board */
/************************************************************
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 1c18495..1a97858 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -502,7 +502,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_DIU_CH7301
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 9b0b917..c471b60 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -500,7 +500,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 2ae6573..5808868 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -414,7 +414,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_DIU_CH7301
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 4b5e451..d542d15 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -484,7 +484,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
#define CONFIG_FSL_DIU_CH7301
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000)
#define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#endif
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index c5705f5..06d2be5 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -108,7 +108,6 @@
#define CONFIG_VIDEO_BMP_LOGO
#endif
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#endif /* #ifndef CONFIG_TQM5200S */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index bb036dc..325c019 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -256,7 +256,6 @@
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_IMX_HDMI
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SOURCE
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index ded26f9..3acdc74 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -226,7 +226,6 @@
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_CMD_BMP
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 2551de4..26554b7 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -80,7 +80,6 @@
#define CONFIG_VIDEO_CORALP
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */
diff --git a/include/configs/icon.h b/include/configs/icon.h
index c38a254..3a72a66 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -134,7 +134,6 @@
#define VIDEO_FB_LITTLE_ENDIAN
#define CONFIG_VIDEO_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CFG_CONSOLE_IS_IN_ENV
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index f833f7d..968c26d 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -183,7 +183,6 @@
#define CONFIG_VIDEO_MX3
#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_CMD_BMP
#define CONFIG_BMP_16BPP
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 436bc75..5298376 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -51,7 +51,6 @@
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index d812e66..2e89b1a 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -360,7 +360,6 @@
#define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
/*
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 50a6ccd..509097f 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -38,7 +38,6 @@
#ifdef CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR + 0x2100)
#define CONFIG_CMD_BMP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#endif
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index b45ad72..ecaeccf 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -208,7 +208,6 @@
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_CMD_BMP
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 8002796..df11e08 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -231,7 +231,6 @@
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_CMD_BMP
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index bf0cb2e..557aee5 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -255,7 +255,6 @@
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_CMD_BMP
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 33459d7..df0cc23 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -144,7 +144,6 @@
/* LCD */
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_MXS
-#define CONFIG_VIDEO_SW_CURSOR
#endif
/* MMC */
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index c106ae3..eafa415 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -233,7 +233,6 @@
#define CONFIG_VIDEO_LOGO
#define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
/* functions for cfb_console */
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 153646f..ff2f6c0 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -408,7 +408,6 @@
#define CONFIG_ATI_RADEON_FB /* use radeon framebuffer driver */
#define VIDEO_IO_OFFSET 0xe8000000
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_SPLASH_SCREEN
#define CONFIG_CMD_BMP
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 9d92a06..16e4b02 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -176,7 +176,6 @@
#define CONFIG_CONSOLE_EXTRA_INFO
#define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 3b9c688..a2969e7 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -290,7 +290,6 @@ extern int soft_i2c_gpio_scl;
#define CONFIG_VIDEO_SUNXI
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_STD_TIMINGS
#define CONFIG_I2C_EDID
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index da1dea8..8fdeaa1 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -74,7 +74,6 @@
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index c1f6b91..352de68 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -129,7 +129,6 @@
/*-----------------------------------------------------------------------
* Video Configuration
*/
-#define CONFIG_VIDEO_SW_CURSOR
#define VIDEO_FB_16BPP_WORD_SWAP
#define CONFIG_CONSOLE_SCROLL_LINES 5
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9d66e6a..dd36855 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8293,7 +8293,6 @@ CONFIG_VIDEO_SM501_8BPP
CONFIG_VIDEO_SM501_PCI
CONFIG_VIDEO_STD_TIMINGS
CONFIG_VIDEO_SUNXI
-CONFIG_VIDEO_SW_CURSOR
CONFIG_VIDEO_VCXK
CONFIG_VID_FLS_ENV
CONFIG_VM86
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 19/29] video: Drop CONFIG_VIDEO_SW_CURSOR
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (17 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 18/29] Convert CONFIG_VIDEO_SW_CURSOR to Kconfig Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 20/29] Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig Simon Glass
` (10 subsequent siblings)
29 siblings, 0 replies; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
Since all boards enable this, we may as well drop the option.
This is a separate patch from the previous one, so it can be skipped if
someone identifies a need.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
README | 1 -
drivers/video/Kconfig | 10 ----------
drivers/video/cfb_console.c | 46 ++++++++++++---------------------------------
3 files changed, 12 insertions(+), 45 deletions(-)
diff --git a/README b/README
index 6367fdd..bfb0139 100644
--- a/README
+++ b/README
@@ -1674,7 +1674,6 @@ CBFS (Coreboot Filesystem) support
CONFIG_VIDEO
CONFIG_CMD_BMP
CONFIG_CFB_CONSOLE
- CONFIG_VIDEO_SW_CURSOR
CONFIG_VGA_AS_SINGLE_DEVICE
CONFIG_VIDEO_LOGO
CONFIG_VIDEO_BMP_LOGO
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4caa92a..2c5ef2b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -482,16 +482,6 @@ config VGA_AS_SINGLE_DEVICE
may be used if you have no keyboard device, or more than one
(USB Keyboard, AT Keyboard).
-config VIDEO_SW_CURSOR
- bool "Enable a software cursor"
- depends on CFB_CONSOLE
- default y if CFB_CONSOLE
- help
- This draws a cursor after the last character. No blinking is
- provided. This makes it possible to see the current cursor
- position when entering text on the console. It is recommended to
- enable this.
-
config VIDEO_CT69000
bool "Enable Chips & Technologies 69000 video driver"
depends on VIDEO
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 56d3c15..c788651 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -58,11 +58,6 @@
* info);
* that fills a info buffer at i=row.
* s.a: board/eltec/bab7xx.
- *
- * CONFIG_VIDEO_SW_CURSOR: - Draws a cursor after the last
- * character. No blinking is provided.
- * Uses the macros CURSOR_SET and
- * CURSOR_OFF.
*/
#include <common.h>
@@ -141,21 +136,6 @@
#include <splash.h>
#endif
-#if !defined(CONFIG_VIDEO_SW_CURSOR)
-/* no Cursor defined */
-#define CURSOR_ON
-#define CURSOR_OFF
-#define CURSOR_SET
-#endif
-
-#if defined(CONFIG_VIDEO_SW_CURSOR)
-void console_cursor(int state);
-
-#define CURSOR_ON console_cursor(1)
-#define CURSOR_OFF console_cursor(0)
-#define CURSOR_SET video_set_cursor()
-#endif /* CONFIG_VIDEO_SW_CURSOR */
-
#ifdef CONFIG_VIDEO_LOGO
#ifdef CONFIG_VIDEO_BMP_LOGO
#include <bmp_logo.h>
@@ -529,14 +509,6 @@ static void video_putchar(int xx, int yy, unsigned char c)
video_drawchars(xx, yy + video_logo_height, &c, 1);
}
-#if defined(CONFIG_VIDEO_SW_CURSOR)
-static void video_set_cursor(void)
-{
- if (cursor_state)
- console_cursor(0);
- console_cursor(1);
-}
-
static void video_invertchar(int xx, int yy)
{
int firstx = xx * VIDEO_PIXEL_SIZE;
@@ -552,7 +524,7 @@ static void video_invertchar(int xx, int yy)
}
}
-void console_cursor(int state)
+static void console_cursor(int state)
{
if (cursor_state != state) {
if (cursor_state) {
@@ -573,7 +545,13 @@ void console_cursor(int state)
if (cfb_do_flush_cache)
flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
}
-#endif
+
+static void video_set_cursor(void)
+{
+ if (cursor_state)
+ console_cursor(0);
+ console_cursor(1);
+}
#ifndef VIDEO_HW_RECTFILL
static void memsetl(int *p, int c, int v)
@@ -779,7 +757,7 @@ static void parse_putc(const char c)
static int nl = 1;
if (console_cursor_is_visible())
- CURSOR_OFF;
+ console_cursor(0);
switch (c) {
case 13: /* back to first column */
@@ -820,7 +798,7 @@ static void parse_putc(const char c)
}
if (console_cursor_is_visible())
- CURSOR_SET;
+ video_set_cursor();
}
static void video_putc(struct stdio_dev *dev, const char c)
@@ -951,7 +929,7 @@ static void video_putc(struct stdio_dev *dev, const char c)
if (flush) {
if (!ansi_cursor_hidden)
- CURSOR_OFF;
+ console_cursor(0);
ansi_buf_size = 0;
switch (cchar) {
case 'A':
@@ -1025,7 +1003,7 @@ static void video_putc(struct stdio_dev *dev, const char c)
break;
}
if (!ansi_cursor_hidden)
- CURSOR_SET;
+ video_set_cursor();
}
} else {
parse_putc(c);
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 20/29] Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (18 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 19/29] video: Drop CONFIG_VIDEO_SW_CURSOR Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:15 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 21/29] video: Move video_get_info_str() prototype to a header file Simon Glass
` (9 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_CONSOLE_EXTRA_INFO
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
configs/MIP405T_defconfig | 1 +
configs/MIP405_defconfig | 1 +
configs/MiniFAP_defconfig | 1 +
configs/PIP405_defconfig | 1 +
configs/TQM5200_B_HIGHBOOT_defconfig | 1 +
configs/TQM5200_B_defconfig | 1 +
configs/TQM5200_STK100_defconfig | 1 +
configs/TQM5200_defconfig | 1 +
configs/charon_defconfig | 1 +
configs/icon_defconfig | 1 +
configs/ipek01_defconfig | 1 +
configs/lwmon5_defconfig | 1 +
configs/socrates_defconfig | 1 +
drivers/video/Kconfig | 10 ++++++++++
include/configs/MIP405.h | 1 -
include/configs/PIP405.h | 1 -
include/configs/TQM5200.h | 1 -
include/configs/icon.h | 1 -
include/configs/ipek01.h | 1 -
include/configs/lwmon5.h | 1 -
include/configs/socrates.h | 1 -
scripts/config_whitelist.txt | 1 -
22 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 81e48dc..ff19c50 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -14,4 +14,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_VIDEO_CT69000=y
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index df0cd84..be9ba32 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -17,4 +17,5 @@ CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_VIDEO_CT69000=y
diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig
index 31602ab..e426cd1 100644
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 4adddea..74c67ac 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -17,4 +17,5 @@ CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_VIDEO_CT69000=y
diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig
index cdba626..085e4f2 100644
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig
index ddd356b..54ae558 100644
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig
index 541a37a..5ee99e3 100644
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig
index 1d31439..faf5802 100644
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@@ -19,4 +19,5 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/charon_defconfig b/configs/charon_defconfig
index a7e60b7..5c8b949 100644
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@@ -19,4 +19,5 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index 565a337..669dc2a 100644
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig
index ee36fab..d81d95c 100644
--- a/configs/ipek01_defconfig
+++ b/configs/ipek01_defconfig
@@ -14,4 +14,5 @@ CONFIG_CMD_MII=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig
index a2259b4..0282d28 100644
--- a/configs/lwmon5_defconfig
+++ b/configs/lwmon5_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index 372918f..867db13 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_OF_LIBFDT=y
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2c5ef2b..5d7e0ff 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -482,6 +482,16 @@ config VGA_AS_SINGLE_DEVICE
may be used if you have no keyboard device, or more than one
(USB Keyboard, AT Keyboard).
+config CONSOLE_EXTRA_INFO
+ bool "Display additional board information"
+ depends on CFB_CONSOLE
+ help
+ Display additional board information strings that normally go to
+ the serial port. When this option is enabled, a board-specific
+ function video_get_info_str() is called to get the string for
+ each line of the display. The function should return the string,
+ which can be empty if there is nothing to display for that line.
+
config VIDEO_CT69000
bool "Enable Chips & Technologies 69000 video driver"
depends on VIDEO
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 257fa47..43468ef 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -343,7 +343,6 @@
* Video support
************************************************************/
#define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
#undef CONFIG_VIDEO_ONBOARD
/************************************************************
* USB support EXPERIMENTAL
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 70e75c1..685922c 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -303,7 +303,6 @@
* Video support
************************************************************/
#define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
#define CONFIG_VIDEO_ONBOARD /* Video controller is on-board */
/************************************************************
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 06d2be5..5439ed6 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -103,7 +103,6 @@
#define CONFIG_VIDEO_LOGO
#ifndef CONFIG_FO300
-#define CONFIG_CONSOLE_EXTRA_INFO
#else
#define CONFIG_VIDEO_BMP_LOGO
#endif
diff --git a/include/configs/icon.h b/include/configs/icon.h
index 3a72a66..c60df49 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -133,7 +133,6 @@
#define CONFIG_VIDEO_SM501_PCI
#define VIDEO_FB_LITTLE_ENDIAN
#define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CFG_CONSOLE_IS_IN_ENV
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 5298376..d53080b 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -50,7 +50,6 @@
#define VIDEO_FB_16BPP_WORD_SWAP
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 2e89b1a..2fed3e0 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -356,7 +356,6 @@
#define CONFIG_VIDEO_MB862xx
#define CONFIG_VIDEO_MB862xx_ACCEL
#define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
#define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 16e4b02..0ae2b78 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -173,7 +173,6 @@
#define CONFIG_VIDEO_MB862xx_ACCEL
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
#define VIDEO_FB_16BPP_PIXEL_SWAP
#define VIDEO_FB_16BPP_WORD_SWAP
#define CONFIG_SPLASH_SCREEN
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index dd36855..f5c53c8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -672,7 +672,6 @@ CONFIG_COMMON_ENV_SETTINGS
CONFIG_COMMON_ENV_UBI
CONFIG_COMPACT_FLASH
CONFIG_COMPAT
-CONFIG_CONSOLE_EXTRA_INFO
CONFIG_CONSOLE_INFO_QUIET
CONFIG_CONSOLE_SCROLL_LINES
CONFIG_CONS_EXTC_PINSEL
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 21/29] video: Move video_get_info_str() prototype to a header file
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (19 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 20/29] Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:19 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 22/29] video: Drop CONFIG_CONSOLE_INFO_QUIET Simon Glass
` (8 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This should be defined in a header file so that arguments are checked.
Move it to video.h.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
board/liebherr/lwmon5/lwmon5.c | 1 +
board/mosaixtech/icon/icon.c | 1 +
board/mpl/common/common_util.c | 1 +
board/tqc/tqm5200/tqm5200.c | 1 +
drivers/video/cfb_console.c | 25 ++++++++-----------------
include/video.h | 11 +++++++++++
6 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/board/liebherr/lwmon5/lwmon5.c b/board/liebherr/lwmon5/lwmon5.c
index 8ad6712..bb99a3b 100644
--- a/board/liebherr/lwmon5/lwmon5.c
+++ b/board/liebherr/lwmon5/lwmon5.c
@@ -13,6 +13,7 @@
#include <asm/io.h>
#include <post.h>
#include <flash.h>
+#include <video.h>
#include <mtd/cfi_flash.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mosaixtech/icon/icon.c b/board/mosaixtech/icon/icon.c
index 1795464..7558234 100644
--- a/board/mosaixtech/icon/icon.c
+++ b/board/mosaixtech/icon/icon.c
@@ -11,6 +11,7 @@
#include <libfdt.h>
#include <fdt_support.h>
#include <netdev.h>
+#include <video.h>
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/ppc4xx-gpio.h>
diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 3c110fa..a6edb6d 100644
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -15,6 +15,7 @@
#include <pci.h>
#include <malloc.h>
#include <bzlib.h>
+#include <video.h>
#ifdef CONFIG_PIP405
#include "../pip405/pip405.h"
diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index 8b82c34..fef9d2b 100644
--- a/board/tqc/tqm5200/tqm5200.c
+++ b/board/tqc/tqm5200/tqm5200.c
@@ -18,6 +18,7 @@
#include <asm/processor.h>
#include <libfdt.h>
#include <netdev.h>
+#include <video.h>
#ifdef CONFIG_VIDEO_SM501
#include <sm501.h>
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index c788651..b02a153 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -64,6 +64,7 @@
#include <fdtdec.h>
#include <version.h>
#include <malloc.h>
+#include <video.h>
#include <linux/compiler.h>
/*
@@ -215,16 +216,6 @@
#endif
#endif
-#ifdef CONFIG_CONSOLE_EXTRA_INFO
-/*
- * setup a board string: type, speed, etc.
- *
- * line_number: location to place info string beside logo
- * info: buffer for info string
- */
-extern void video_get_info_str(int line_number, char *info);
-#endif
-
DECLARE_GLOBAL_DATA_PTR;
/* Locals */
@@ -801,7 +792,7 @@ static void parse_putc(const char c)
video_set_cursor();
}
-static void video_putc(struct stdio_dev *dev, const char c)
+static void cfb_video_putc(struct stdio_dev *dev, const char c)
{
#ifdef CONFIG_CFB_CONSOLE_ANSI
int i;
@@ -1015,7 +1006,7 @@ static void video_putc(struct stdio_dev *dev, const char c)
flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
}
-static void video_puts(struct stdio_dev *dev, const char *s)
+static void cfb_video_puts(struct stdio_dev *dev, const char *s)
{
int flush = cfb_do_flush_cache;
int count = strlen(s);
@@ -1024,7 +1015,7 @@ static void video_puts(struct stdio_dev *dev, const char *s)
cfb_do_flush_cache = 0;
while (count--)
- video_putc(dev, *s++);
+ cfb_video_putc(dev, *s++);
if (flush) {
cfb_do_flush_cache = flush;
@@ -1991,7 +1982,7 @@ void video_clear(void)
#endif
}
-static int video_init(void)
+static int cfg_video_init(void)
{
unsigned char color8;
@@ -2117,7 +2108,7 @@ int drv_video_init(void)
return 0;
/* Init video chip - returns with framebuffer cleared */
- if (video_init() == -1)
+ if (cfg_video_init() == -1)
return 0;
if (board_cfb_skip())
@@ -2142,8 +2133,8 @@ int drv_video_init(void)
memset(&console_dev, 0, sizeof(console_dev));
strcpy(console_dev.name, "vga");
console_dev.flags = DEV_FLAGS_OUTPUT;
- console_dev.putc = video_putc; /* 'putc' function */
- console_dev.puts = video_puts; /* 'puts' function */
+ console_dev.putc = cfb_video_putc; /* 'putc' function */
+ console_dev.puts = cfb_video_puts; /* 'puts' function */
#if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
if (have_keyboard && keyboard_ok) {
diff --git a/include/video.h b/include/video.h
index 0d5bd21..5b4e78b 100644
--- a/include/video.h
+++ b/include/video.h
@@ -245,6 +245,17 @@ int lg4573_spi_startup(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int spi_mode);
#endif
+/*
+ * video_get_info_str() - obtain a board string: type, speed, etc.
+ *
+ * This is called if CONFIG_CONSOLE_EXTRA_INFO is enabled.
+ *
+ * line_number: location to place info string beside logo
+ * info: buffer for info string (empty if nothing to display on this
+ * line)
+ */
+void video_get_info_str(int line_number, char *info);
+
#endif /* CONFIG_DM_VIDEO */
#endif
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 22/29] video: Drop CONFIG_CONSOLE_INFO_QUIET
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (20 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 21/29] video: Move video_get_info_str() prototype to a header file Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:20 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 23/29] Convert CONFIG_LCD to Kconfig Simon Glass
` (7 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This is not used in U-Boot. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
include/configs/edminiv2.h | 1 -
include/configs/km/km_arm.h | 1 -
include/configs/mv-common.h | 1 -
include/configs/mvebu_db-88f3720.h | 1 -
include/configs/mvebu_db-88f7040.h | 1 -
scripts/config_whitelist.txt | 1 -
6 files changed, 6 deletions(-)
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 982d526..51e17c5 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -208,7 +208,6 @@
/*
* Other required minimal configurations
*/
-#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */
#define CONFIG_DISPLAY_CPUINFO /* Display cpu info */
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 25db704..e2fade0 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -146,7 +146,6 @@
/*
* Other required minimal configurations
*/
-#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */
#define CONFIG_DISPLAY_CPUINFO /* Display cpu info */
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index ed271c2..a9ac7ff 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -83,7 +83,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */
#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h
index e785f24..7a50c4e 100644
--- a/include/configs/mvebu_db-88f3720.h
+++ b/include/configs/mvebu_db-88f3720.h
@@ -51,7 +51,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
diff --git a/include/configs/mvebu_db-88f7040.h b/include/configs/mvebu_db-88f7040.h
index cfb0191..709098f 100644
--- a/include/configs/mvebu_db-88f7040.h
+++ b/include/configs/mvebu_db-88f7040.h
@@ -54,7 +54,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f5c53c8..f87efb3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -672,7 +672,6 @@ CONFIG_COMMON_ENV_SETTINGS
CONFIG_COMMON_ENV_UBI
CONFIG_COMPACT_FLASH
CONFIG_COMPAT
-CONFIG_CONSOLE_INFO_QUIET
CONFIG_CONSOLE_SCROLL_LINES
CONFIG_CONS_EXTC_PINSEL
CONFIG_CONS_EXTC_RATE
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 23/29] Convert CONFIG_LCD to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (21 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 22/29] video: Drop CONFIG_CONSOLE_INFO_QUIET Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:21 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 24/29] Convert CONFIG_CONSOLE_SCROLL_LINES " Simon Glass
` (6 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_LCD
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
configs/TQM823L_LCD_defconfig | 3 ++-
configs/TTTech_defconfig | 3 ++-
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/brppt1_mmc_defconfig | 1 +
configs/brppt1_nand_defconfig | 1 +
configs/brppt1_spi_defconfig | 1 +
configs/brxre1_defconfig | 1 +
configs/cm_t3517_defconfig | 1 +
configs/cm_t35_defconfig | 1 +
configs/peach-pi_defconfig | 1 +
configs/peach-pit_defconfig | 1 +
configs/picosam9g45_defconfig | 1 +
configs/pm9261_defconfig | 1 +
configs/pm9263_defconfig | 1 +
configs/rpi_2_defconfig | 1 +
configs/rpi_3_32b_defconfig | 1 +
configs/rpi_3_defconfig | 1 +
configs/rpi_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/snow_defconfig | 1 +
configs/spring_defconfig | 1 +
configs/wtk_defconfig | 3 ++-
configs/zipitz2_defconfig | 1 +
drivers/video/Kconfig | 8 ++++++++
include/configs/M52277EVB.h | 1 -
include/configs/at91sam9261ek.h | 1 -
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/brppt1.h | 1 -
include/configs/brxre1.h | 1 -
include/configs/cm_t35.h | 1 -
include/configs/cm_t3517.h | 1 -
include/configs/exynos5-dt-common.h | 1 -
include/configs/ma5d4evk.h | 1 -
include/configs/peach-pi.h | 1 -
include/configs/picosam9g45.h | 1 -
include/configs/pm9261.h | 1 -
include/configs/pm9263.h | 1 -
include/configs/rpi.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/smdk5250.h | 1 -
include/configs/smdk5420.h | 1 -
include/configs/zipitz2.h | 1 -
scripts/config_whitelist.txt | 1 -
77 files changed, 61 insertions(+), 29 deletions(-)
diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig
index 38f5119..9bc8c73 100644
--- a/configs/TQM823L_LCD_defconfig
+++ b/configs/TQM823L_LCD_defconfig
@@ -2,7 +2,7 @@ CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="LCD,NEC_NL6448BC20"
+CONFIG_SYS_EXTRA_OPTIONS="NEC_NL6448BC20"
CONFIG_BOOTDELAY=5
CONFIG_HUSH_PARSER=y
CONFIG_CMD_ASKENV=y
@@ -10,4 +10,5 @@ CONFIG_CMD_ASKENV=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_SNTP=y
CONFIG_CMD_EXT2=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig
index e545848..9649012 100644
--- a/configs/TTTech_defconfig
+++ b/configs/TTTech_defconfig
@@ -2,7 +2,7 @@ CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ104V7DS01"
+CONFIG_SYS_EXTRA_OPTIONS="SHARP_LQ104V7DS01"
CONFIG_BOOTDELAY=5
CONFIG_HUSH_PARSER=y
CONFIG_CMD_ASKENV=y
@@ -10,4 +10,5 @@ CONFIG_CMD_ASKENV=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_SNTP=y
CONFIG_CMD_EXT2=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 99bb49e..dbe656a 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index 014e50e..98a152e 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index e0e8fea..2d4a9af 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index 38b9635..5ec3176 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index 38b9635..5ec3176 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index 317d9c2..3838f94 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index a26d7d1..556845a 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index 8b72678..18b67c9 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index 0293aa6..eb26ec9 100644
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index 777d234..c6ccbb5 100644
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
index 788e7e1..22fc450 100644
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig
index 9604af9..57ea3ca 100644
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -29,4 +29,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig
index e1aebb1..092b7f9 100644
--- a/configs/at91sam9m10g45ek_nandflash_defconfig
+++ b/configs/at91sam9m10g45ek_nandflash_defconfig
@@ -27,4 +27,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index ce62edf..e46c03e 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -21,4 +21,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index 3b7ebc2..ee98054 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -27,4 +27,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index 26c93af..8db4cbc 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -28,4 +28,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index 494a630..8c8f350 100644
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_MMC=y
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
CONFIG_CMD_FAT=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
index f0ea3f0..9140b21 100644
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_MMC=y
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
CONFIG_CMD_FAT=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
index 0a414e4..08a4639 100644
--- a/configs/at91sam9rlek_nandflash_defconfig
+++ b/configs/at91sam9rlek_nandflash_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_MMC=y
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
CONFIG_CMD_FAT=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index bb47f4a..6cba891 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -23,4 +23,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index a7d2c9d..8730d70 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -23,4 +23,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index b482687..5744c62 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -29,4 +29,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index 5446215..7caec2c 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -30,4 +30,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index e990f03..0a3ea12 100644
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -45,4 +45,5 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 8872f4a..0fabecc 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -45,4 +45,5 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index c04dde8..09fd2df 100644
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -53,4 +53,5 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index 0251088..27cdb62 100644
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -44,5 +44,6 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set
diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
index b131b27..3bca796 100644
--- a/configs/cm_t3517_defconfig
+++ b/configs/cm_t3517_defconfig
@@ -23,4 +23,5 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index 9a2f624..0fbc08b 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -24,4 +24,5 @@ CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index e5f34a1..df160ae 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -67,5 +67,6 @@ CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_BRIDGE=y
CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
+CONFIG_LCD=y
CONFIG_TPM=y
CONFIG_ERRNO_STR=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index ddcb451..abc23c4 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -67,5 +67,6 @@ CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_BRIDGE=y
CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
+CONFIG_LCD=y
CONFIG_TPM=y
CONFIG_ERRNO_STR=y
diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig
index a3a4f5d..5413f09 100644
--- a/configs/picosam9g45_defconfig
+++ b/configs/picosam9g45_defconfig
@@ -30,4 +30,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index 63637e7..b1510cb 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -17,3 +17,4 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index 7ffde4b..be58975 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -17,3 +17,4 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 69d208d..4a30450 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -21,5 +21,6 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index 0e408d2..b622afe 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -23,5 +23,6 @@ CONFIG_CMD_FS_GENERIC=y
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index 6ad4189..df639aa 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -22,5 +22,6 @@ CONFIG_CMD_FS_GENERIC=y
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index ac1f38e..f0418f0 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -21,5 +21,6 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
index 8cee4c2..3e72e6a 100644
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -31,4 +31,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
index 8dc5e24..cec7bb2 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -29,4 +29,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
index 019869c..eb60bfe 100644
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -30,4 +30,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
index f9c766a..63e9f27 100644
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -32,4 +32,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig
index c8456d0..5a6def9 100644
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -30,4 +30,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig
index a061c4d..9f87f15 100644
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -31,4 +31,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index a5754f8..c5d8d39 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -75,5 +75,6 @@ CONFIG_DISPLAY=y
CONFIG_VIDEO_BRIDGE=y
CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
+CONFIG_LCD=y
CONFIG_TPM=y
CONFIG_ERRNO_STR=y
diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index 0c394c8..8aab175 100644
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -74,5 +74,6 @@ CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_BRIDGE=y
CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
+CONFIG_LCD=y
CONFIG_TPM=y
CONFIG_ERRNO_STR=y
diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig
index 336d8e4..3e4f386 100644
--- a/configs/wtk_defconfig
+++ b/configs/wtk_defconfig
@@ -2,7 +2,7 @@ CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ065T9DR51U"
+CONFIG_SYS_EXTRA_OPTIONS="SHARP_LQ065T9DR51U"
CONFIG_BOOTDELAY=5
CONFIG_HUSH_PARSER=y
CONFIG_CMD_ASKENV=y
@@ -10,4 +10,5 @@ CONFIG_CMD_ASKENV=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_SNTP=y
CONFIG_CMD_EXT2=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index a776055..08cd3a0 100644
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -14,5 +14,6 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 5d7e0ff..2f0d2fb 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -541,4 +541,12 @@ config SYS_CONSOLE_FG_COL
the background and foreground to the same colour or you will see
nothing.
+config LCD
+ bool "Enable legacy LCD support"
+ help
+ Define this to enable LCD support (for output to LCD display).
+ You will also need to select an LCD driver using an additional
+ CONFIG option. See the README for details. Drives which have been
+ converted to driver model will instead used CONFIG_DM_VIDEO.
+
endmenu
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 898ed7d..6230948 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -84,7 +84,6 @@
/* LCD */
#ifdef CONFIG_CMD_BMP
-#define CONFIG_LCD
#define CONFIG_SPLASH_SCREEN
#define CONFIG_LCD_LOGO
#define CONFIG_SHARP_LQ035Q7DH06
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 591c7d4..e940ac0 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -49,7 +49,6 @@
#define CONFIG_BAUDRATE 115200
/* LCD */
-#define CONFIG_LCD
#define LCD_BPP LCD_COLOR8
#define CONFIG_LCD_LOGO
#undef LCD_TEST_PATTERN
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index ecc87ea..f8ecc14 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -59,7 +59,6 @@
#define CONFIG_BAUDRATE 115200
/* LCD */
-#define CONFIG_LCD 1
#define LCD_BPP LCD_COLOR8
#define CONFIG_LCD_LOGO 1
#undef LCD_TEST_PATTERN
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index e89c19b..2417950 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -41,7 +41,6 @@
#define CONFIG_USART_ID ATMEL_ID_SYS
/* LCD */
-#define CONFIG_LCD
#define LCD_BPP LCD_COLOR8
#define CONFIG_LCD_LOGO
#undef LCD_TEST_PATTERN
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index a54e59e..b8f149e 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -40,7 +40,6 @@
#define CONFIG_BAUDRATE 115200
/* LCD */
-#define CONFIG_LCD
#define LCD_BPP LCD_COLOR16
#define LCD_OUTPUT_BPP 24
#define CONFIG_LCD_LOGO
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 1bbfb9e..2211d8a 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -46,7 +46,6 @@
#define CONFIG_BAUDRATE 115200
/* LCD */
-#define CONFIG_LCD 1
#define LCD_BPP LCD_COLOR8
#define CONFIG_LCD_LOGO 1
#undef LCD_TEST_PATTERN
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 209e6e6..b8d035b 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -36,7 +36,6 @@
#define CONFIG_USART_ID ATMEL_ID_SYS
/* LCD */
-#define CONFIG_LCD
#define LCD_BPP LCD_COLOR16
#define LCD_OUTPUT_BPP 24
#define CONFIG_LCD_LOGO
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index e01d535..1a76e2f 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -16,7 +16,6 @@
#include <configs/bur_am335x_common.h>
/* ------------------------------------------------------------------------- */
#define CONFIG_AM335X_LCD
-#define CONFIG_LCD
#define CONFIG_LCD_ROTATION
#define CONFIG_LCD_DT_SIMPLEFB
#define CONFIG_SYS_WHITE_ON_BLACK
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 1e8426f..b9f69be 100644
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -16,7 +16,6 @@
#include <configs/bur_am335x_common.h>
/* ------------------------------------------------------------------------- */
#define CONFIG_AM335X_LCD
-#define CONFIG_LCD
#define CONFIG_LCD_NOSTDOUT
#define CONFIG_SYS_WHITE_ON_BLACK
#define LCD_BPP LCD_COLOR32
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 0cd2f3c..7225c8a 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -286,7 +286,6 @@
#define CONFIG_VIDEO_OMAP3
#define LCD_BPP LCD_COLOR16
-#define CONFIG_LCD
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SOURCE
#define CONFIG_CMD_BMP
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 893d637..07d30bd 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -287,7 +287,6 @@
#define CONFIG_VIDEO_OMAP3
#define LCD_BPP LCD_COLOR16
-#define CONFIG_LCD
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASHIMAGE_GUARD
#define CONFIG_CMD_BMP
diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
index 3d81f94..7cb3a29 100644
--- a/include/configs/exynos5-dt-common.h
+++ b/include/configs/exynos5-dt-common.h
@@ -27,7 +27,6 @@
#define CONFIG_BOARD_COMMON
/* Display */
-#define CONFIG_LCD
#ifdef CONFIG_LCD
#define CONFIG_EXYNOS_FB
#define CONFIG_EXYNOS_DP
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 8fe5db6..91037d6 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -21,7 +21,6 @@
*/
#define CONFIG_DOS_PARTITION
#define CONFIG_FAT_WRITE
-/*#define CONFIG_LCD*/
/*
* Memory configurations
diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index b01fe4c..296d77a 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -30,7 +30,6 @@
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
/* Display */
-#define CONFIG_LCD
#ifdef CONFIG_LCD
#define CONFIG_EXYNOS_FB
#define CONFIG_EXYNOS_DP
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 8ebf336..c44afa6 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -44,7 +44,6 @@
#define CONFIG_USART_ID ATMEL_ID_SYS
/* LCD */
-#define CONFIG_LCD
#define LCD_BPP LCD_COLOR8
#define CONFIG_LCD_LOGO
#undef LCD_TEST_PATTERN
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index fbb7146..f61f567 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -151,7 +151,6 @@
#define CONFIG_USART_ID ATMEL_ID_SYS
/* LCD */
-#define CONFIG_LCD 1
#define LCD_BPP LCD_COLOR8
#define CONFIG_LCD_LOGO 1
#undef LCD_TEST_PATTERN
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index a4672b0..93f30d7 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -164,7 +164,6 @@
#define CONFIG_USART_ID ATMEL_ID_SYS
/* LCD */
-#define CONFIG_LCD 1
#define LCD_BPP LCD_COLOR8
#define CONFIG_LCD_LOGO 1
#undef LCD_TEST_PATTERN
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index decf35a..4ad98e1 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -71,7 +71,6 @@
/* GPIO */
#define CONFIG_BCM2835_GPIO
/* LCD */
-#define CONFIG_LCD
#define CONFIG_LCD_DT_SIMPLEFB
#define LCD_BPP LCD_COLOR16
/*
diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index c20d6f9..30fb9a4 100644
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -86,7 +86,6 @@
#define CONFIG_MACB_SEARCH_PHY
/* LCD */
-/* #define CONFIG_LCD */
#ifdef CONFIG_LCD
#define LCD_BPP LCD_COLOR16
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index c149e5b..1b053a6 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -39,7 +39,6 @@
#define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP
/* LCD */
-#define CONFIG_LCD
#define LCD_BPP LCD_COLOR16
#define LCD_OUTPUT_BPP 24
#define CONFIG_LCD_LOGO
diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index 0890cf5..249e661 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -94,7 +94,6 @@
#define CONFIG_MACB_SEARCH_PHY
/* LCD */
-/* #define CONFIG_LCD */
#ifdef CONFIG_LCD
#define LCD_BPP LCD_COLOR16
#define LCD_OUTPUT_BPP 24
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 36da48c..00ed400 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -94,7 +94,6 @@
#define CONFIG_MACB_SEARCH_PHY
/* LCD */
-#define CONFIG_LCD
#define LCD_BPP LCD_COLOR16
#define LCD_OUTPUT_BPP 18
#define CONFIG_LCD_LOGO
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 5c60887..c152459 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -13,7 +13,6 @@
#include <configs/exynos5-dt-common.h>
#include <configs/exynos5-common.h>
-#undef CONFIG_LCD
#undef CONFIG_EXYNOS_FB
#undef CONFIG_EXYNOS_DP
#undef CONFIG_KEYBOARD
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index d8d095f..502772c 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -13,7 +13,6 @@
#include <configs/exynos5-dt-common.h>
#include <configs/exynos5-common.h>
-#undef CONFIG_LCD
#undef CONFIG_EXYNOS_FB
#undef CONFIG_EXYNOS_DP
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 6e83cc9..ed2c9ac 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -75,7 +75,6 @@
*/
#ifdef CONFIG_CMD_SPI
#define CONFIG_SOFT_SPI
-#define CONFIG_LCD
#define CONFIG_LCD_ROTATION
#define CONFIG_PXA_LCD
#define CONFIG_LMS283GF05
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f87efb3..09ec741 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1885,7 +1885,6 @@ CONFIG_LAYERSCAPE_NS_ACCESS
CONFIG_LBA48
CONFIG_LBD
CONFIG_LBDAF
-CONFIG_LCD
CONFIG_LCD_ALIGNMENT
CONFIG_LCD_BMP_RLE8
CONFIG_LCD_DT_SIMPLEFB
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 24/29] Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (22 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 23/29] Convert CONFIG_LCD to Kconfig Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 25/29] Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE " Simon Glass
` (5 subsequent siblings)
29 siblings, 0 replies; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_CONSOLE_SCROLL_LINES
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
README | 6 ------
configs/bayleybay_defconfig | 1 +
configs/chromebook_jerry_defconfig | 1 +
configs/chromebook_link_defconfig | 1 +
configs/chromebook_samus_defconfig | 1 +
configs/chromebox_panther_defconfig | 1 +
configs/colibri_t20_defconfig | 1 +
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
configs/conga-qeval20-qa3-e3845_defconfig | 1 +
configs/coreboot-x86_defconfig | 1 +
configs/crownbay_defconfig | 1 +
configs/dfi-bt700-q7x-151_defconfig | 1 +
configs/firefly-rk3288_defconfig | 1 +
configs/harmony_defconfig | 1 +
configs/minnowmax_defconfig | 1 +
configs/paz00_defconfig | 1 +
configs/qemu-x86_defconfig | 1 +
configs/qemu-x86_efi_payload32_defconfig | 1 +
configs/qemu-x86_efi_payload64_defconfig | 1 +
configs/rock2_defconfig | 1 +
configs/seaboard_defconfig | 1 +
configs/som-db5800-som-6867_defconfig | 1 +
configs/theadorable-x86-dfi-bt700_defconfig | 1 +
configs/ventana_defconfig | 1 +
drivers/video/Kconfig | 10 ++++++++++
include/configs/chromebook_jerry.h | 1 -
include/configs/colibri_pxa270.h | 1 -
include/configs/colibri_t20.h | 1 -
include/configs/evb_rk3288.h | 1 -
include/configs/evb_rk3399.h | 1 -
include/configs/fennec_rk3288.h | 1 -
include/configs/firefly-rk3288.h | 1 -
include/configs/harmony.h | 1 -
include/configs/miniarm_rk3288.h | 1 -
include/configs/paz00.h | 1 -
include/configs/popmetal_rk3288.h | 1 -
include/configs/rock2.h | 1 -
include/configs/rpi.h | 1 -
include/configs/seaboard.h | 1 -
include/configs/ventana.h | 1 -
include/configs/x86-common.h | 1 -
include/lcd_console.h | 3 ---
scripts/config_whitelist.txt | 1 -
43 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/README b/README
index bfb0139..e9ed9bb 100644
--- a/README
+++ b/README
@@ -1743,12 +1743,6 @@ CBFS (Coreboot Filesystem) support
here, since it is cheaper to change data cache settings on
a per-section basis.
- CONFIG_CONSOLE_SCROLL_LINES
-
- When the console need to be scrolled, this is the number of
- lines to scroll by. It defaults to 1. Increasing this makes
- the console jump but can help speed up operation when scrolling
- is slow.
CONFIG_LCD_ROTATION
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 6de6c1e..e6d8418c 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -59,4 +59,5 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 9677e60..a5809ac 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -78,6 +78,7 @@ CONFIG_SYSRESET=y
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 2f35b77..7922fcc 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -63,5 +63,6 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_TPM=y
diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig
index 1822970..7e9857e 100644
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -60,5 +60,6 @@ CONFIG_DM_VIDEO=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
CONFIG_VIDEO_BROADWELL_IGD=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_TPM=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 0d5aaa7..acc1038 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -55,5 +55,6 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_TPM=y
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 2745d8b..f4ea6e3 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -52,3 +52,4 @@ CONFIG_G_DNL_VENDOR_NUM=0x0955
CONFIG_G_DNL_PRODUCT_NUM=0x701a
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 513f3c4..7cb935e 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -67,4 +67,5 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index cc6385b..9209ed0 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -66,4 +66,5 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 693302c..f640c5a 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -42,5 +42,6 @@ CONFIG_TPM_TIS_LPC=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_TPM=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index a1587ef..0ec3851 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -52,4 +52,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 3c6b94f..414c615 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -64,4 +64,5 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index f640fce..b9ebc0f 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -67,6 +67,7 @@ CONFIG_SYSRESET=y
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index 4fbca28..54490c3 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -39,3 +39,4 @@ CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 65da516..ebfcab7 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -63,4 +63,5 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index b86f76c..f2a3c5c 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -37,3 +37,4 @@ CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 9bd9c1d..3acdaeb 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -50,4 +50,5 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index 9374dde..13b1fef 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -47,6 +47,7 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index 85dc3e9..8d48afa 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -47,6 +47,7 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 5ba7769..f8cebd2 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -63,6 +63,7 @@ CONFIG_SYSRESET=y
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 806caca..230c4b8 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -40,3 +40,4 @@ CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index bbdcbc0..ba97a8e 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -61,4 +61,5 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 44f7b7c..446ce7a 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -61,4 +61,5 @@ CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
CONFIG_CFB_CONSOLE=y
+CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 56e7ba3..aac1818 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -39,3 +39,4 @@ CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y
+CONFIG_CONSOLE_SCROLL_LINES=10
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2f0d2fb..7bb8441 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -492,6 +492,16 @@ config CONSOLE_EXTRA_INFO
each line of the display. The function should return the string,
which can be empty if there is nothing to display for that line.
+config CONSOLE_SCROLL_LINES
+ int "Number of lines to scroll the console by"
+ depends on CFB_CONSOLE || DM_VIDEO || LCD
+ default 1
+ help
+ When the console need to be scrolled, this is the number of
+ lines to scroll by. It defaults to 1. Increasing this makes the
+ console jump but can help speed up operation when scrolling
+ is slow.
+
config VIDEO_CT69000
bool "Enable Chips & Technologies 69000 video driver"
depends on VIDEO
diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h
index 180527a..b15cc26 100644
--- a/include/configs/chromebook_jerry.h
+++ b/include/configs/chromebook_jerry.h
@@ -23,6 +23,5 @@
#define CONFIG_KEYBOARD
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index ba8d93c..429f571 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -67,7 +67,6 @@
#define CONFIG_PXA_LCD
#define CONFIG_PXA_VGA
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#define CONFIG_CMD_BMP
#define CONFIG_LCD_LOGO
#endif
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index b299e15..4634989 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -47,7 +47,6 @@
/* LCD support */
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#define CONFIG_CMD_BMP
#define CONFIG_LCD_LOGO
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h
index 390c243..77b647e 100644
--- a/include/configs/evb_rk3288.h
+++ b/include/configs/evb_rk3288.h
@@ -19,6 +19,5 @@
#define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif
diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
index 047850a..f453640 100644
--- a/include/configs/evb_rk3399.h
+++ b/include/configs/evb_rk3399.h
@@ -21,6 +21,5 @@
#define SDRAM_BANK_SIZE (2UL << 30)
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif
diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h
index 390c243..77b647e 100644
--- a/include/configs/fennec_rk3288.h
+++ b/include/configs/fennec_rk3288.h
@@ -19,6 +19,5 @@
#define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif
diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index ee924c3..14fdead 100644
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -23,6 +23,5 @@
#define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 2ecae65..3d6b5fc 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -54,7 +54,6 @@
/* LCD support */
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#include "tegra-common-post.h"
diff --git a/include/configs/miniarm_rk3288.h b/include/configs/miniarm_rk3288.h
index 390c243..77b647e 100644
--- a/include/configs/miniarm_rk3288.h
+++ b/include/configs/miniarm_rk3288.h
@@ -19,6 +19,5 @@
#define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 5e59ccb..a8bb3ff 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -45,7 +45,6 @@
/* LCD support */
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#include "tegra-common-post.h"
diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h
index 390c243..77b647e 100644
--- a/include/configs/popmetal_rk3288.h
+++ b/include/configs/popmetal_rk3288.h
@@ -19,6 +19,5 @@
#define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif
diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index ee924c3..14fdead 100644
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -23,6 +23,5 @@
#define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#endif
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 4ad98e1..7fe469c 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -81,7 +81,6 @@
#define CONFIG_FB_ADDR 0
#define CONFIG_VIDEO_BCM2835
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
/* SD/MMC configuration */
#define CONFIG_GENERIC_MMC
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 3076ef4..fe68437 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -61,7 +61,6 @@
/* LCD support */
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
/* NAND support */
#define CONFIG_CMD_NAND
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index b282467..d3843d4 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -46,7 +46,6 @@
/* LCD support */
#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES 10
#include "tegra-common-post.h"
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 352de68..ebb257b 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -130,7 +130,6 @@
* Video Configuration
*/
#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_CONSOLE_SCROLL_LINES 5
/*-----------------------------------------------------------------------
* CPU Features
diff --git a/include/lcd_console.h b/include/lcd_console.h
index 2e0f56f..eac227f 100644
--- a/include/lcd_console.h
+++ b/include/lcd_console.h
@@ -5,9 +5,6 @@
*/
/* By default we scroll by a single line */
-#ifndef CONFIG_CONSOLE_SCROLL_LINES
-#define CONFIG_CONSOLE_SCROLL_LINES 1
-#endif
struct console_t {
short curr_col, curr_row;
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 09ec741..eab3969 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -672,7 +672,6 @@ CONFIG_COMMON_ENV_SETTINGS
CONFIG_COMMON_ENV_UBI
CONFIG_COMPACT_FLASH
CONFIG_COMPAT
-CONFIG_CONSOLE_SCROLL_LINES
CONFIG_CONS_EXTC_PINSEL
CONFIG_CONS_EXTC_RATE
CONFIG_CONS_NONE
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 25/29] Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (23 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 24/29] Convert CONFIG_CONSOLE_SCROLL_LINES " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 26/29] Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE " Simon Glass
` (4 subsequent siblings)
29 siblings, 0 replies; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_ENV_OVERWRITE
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
README | 3 ---
common/Kconfig | 9 +++++++++
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 +
include/configs/MIP405.h | 1 -
include/configs/MigoR.h | 1 -
include/configs/PIP405.h | 1 -
include/configs/ap325rxa.h | 1 -
include/configs/ap_sh4a_4a.h | 1 -
include/configs/armadillo-800eva.h | 1 -
include/configs/ecovec.h | 1 -
include/configs/kzm9g.h | 1 -
include/configs/ms7722se.h | 1 -
include/configs/r0p7734.h | 1 -
include/configs/rcar-gen2-common.h | 1 -
include/configs/rcar-gen3-common.h | 1 -
include/configs/sh7752evb.h | 1 -
include/configs/sh7753evb.h | 1 -
include/configs/sh7757lcr.h | 1 -
include/configs/sh7785lcr.h | 1 -
include/configs/socfpga_common.h | 1 -
scripts/config_whitelist.txt | 1 -
29 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/README b/README
index e9ed9bb..7091429 100644
--- a/README
+++ b/README
@@ -3588,9 +3588,6 @@ Configuration Settings:
- CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
Enable the call to overwrite_console().
-- CONFIG_SYS_CONSOLE_ENV_OVERWRITE
- Enable overwrite of previous console environment settings.
-
- CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END:
Begin and End addresses of the area used by the
simple memory test.
diff --git a/common/Kconfig b/common/Kconfig
index 0a417c9..5c0441b 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -309,6 +309,15 @@ config SYS_CONSOLE_IS_IN_ENV
environment variables can be updated after boot to change the
input/output devices.
+config SYS_CONSOLE_ENV_OVERWRITE
+ bool "Update environment variables during console init"
+ help
+ The console environment variables (stdout, stdin, stderr) can be
+ used to determine the correct console devices on start-up. This
+ option writes the console devices to these variables on console
+ start-up (after relocation). This causes the environment to be
+ updated to match the console devices actually chosen.
+
endmenu
config SYS_NO_FLASH
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index 6fd0354..d896861 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index c345faf..c6f7fd4 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
index e880e01..32ba494 100644
--- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig
index 671423a..a683b2d 100644
--- a/configs/socfpga_is1_defconfig
+++ b/configs/socfpga_is1_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig
index 13903f7..6dc4b10 100644
--- a/configs/socfpga_mcvevk_defconfig
+++ b/configs/socfpga_mcvevk_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig
index 920084d..eb6304a 100644
--- a/configs/socfpga_sockit_defconfig
+++ b/configs/socfpga_sockit_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index 0894cce..6a8becc 100644
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
index 9db5493..5296c78 100644
--- a/configs/socfpga_sr1500_defconfig
+++ b/configs/socfpga_sr1500_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index faa05e5..eedf750 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
CONFIG_FIT=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 43468ef..8ad34b1 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -114,7 +114,6 @@
* defines if the overwrite_console should be stored in the
* environment
**************************************************************/
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/**************************************************************
* loads config
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index a4eabe5..588ddd4 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -43,7 +43,6 @@
#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console
information at boot */
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (MIGO_R_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 685922c..b77aacb 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -110,7 +110,6 @@
* defines if the overwrite_console should be stored in the
* environment
**************************************************************/
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/**************************************************************
* loads config
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 32acb08..795a7d2 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -57,7 +57,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (AP325RXA_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index d41b624..fc08d7b 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -73,7 +73,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index e3f4a7b..175a124 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -62,7 +62,6 @@
#define CONFIG_SCIF_A
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (ARMADILLO_800EVA_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index c8508ff..8ab26e6 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -93,7 +93,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 409c30d..921474f 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -58,7 +58,6 @@
#define CONFIG_CONS_SCIF4
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (KZM_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END \
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 9b0c166..d0b6e58 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -42,7 +42,6 @@
#define CONFIG_CONS_SCIF0 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (MS7722SE_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index 2d7e326..408ae21 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -78,7 +78,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 5733da6..ccd5026 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -44,7 +44,6 @@
/* console */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 256
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 7655417..a435708 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -52,7 +52,6 @@
/* console */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 256
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index cfcde81..fd32ddc 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -46,7 +46,6 @@
#define CONFIG_CONS_SCIF2 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (SH7752EVB_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index fefdbb4..57c8e76 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -46,7 +46,6 @@
#define CONFIG_CONS_SCIF2 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (SH7753EVB_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 262d390..cb09a7c 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -46,7 +46,6 @@
#define CONFIG_CONS_SCIF2 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (SH7757LCR_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 80e61a4..6eee51e 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -62,7 +62,6 @@
#define CONFIG_SCIF_EXT_CLOCK 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (SH7785LCR_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 39dcd51..386c891 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -253,7 +253,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
* U-Boot environment
*/
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#if !defined(CONFIG_ENV_SIZE)
#define CONFIG_ENV_SIZE 4096
#endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index eab3969..c0fcd65 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4610,7 +4610,6 @@ CONFIG_SYS_CMXFCR_VALUE1
CONFIG_SYS_CMXFCR_VALUE2
CONFIG_SYS_CMXFCR_VALUE3
CONFIG_SYS_CMXSCR_VALUE
-CONFIG_SYS_CONSOLE_ENV_OVERWRITE
CONFIG_SYS_CONSOLE_INFO_QUIET
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
CONFIG_SYS_CORE_SRAM
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 26/29] Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (24 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 25/29] Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:23 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET " Simon Glass
` (3 subsequent siblings)
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v3: None
Changes in v2: None
README | 3 ---
common/Kconfig | 9 +++++++++
configs/MIP405T_defconfig | 1 +
configs/MIP405_defconfig | 1 +
configs/PIP405_defconfig | 1 +
configs/aristainetos2_defconfig | 1 +
configs/aristainetos2b_defconfig | 1 +
configs/aristainetos_defconfig | 1 +
configs/brppt1_mmc_defconfig | 1 +
configs/brppt1_nand_defconfig | 1 +
configs/brppt1_spi_defconfig | 1 +
configs/brxre1_defconfig | 1 +
configs/cgtqmx6eval_defconfig | 1 +
configs/dms-ba16-1g_defconfig | 1 +
configs/dms-ba16_defconfig | 1 +
configs/ea20_defconfig | 1 +
configs/ge_b450v3_defconfig | 1 +
configs/ge_b650v3_defconfig | 1 +
configs/ge_b850v3_defconfig | 1 +
configs/marsboard_defconfig | 1 +
configs/mx51evk_defconfig | 1 +
configs/mx53loco_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/nitrogen6dl2g_defconfig | 1 +
configs/nitrogen6dl_defconfig | 1 +
configs/nitrogen6q2g_defconfig | 1 +
configs/nitrogen6q_defconfig | 1 +
configs/nitrogen6s1g_defconfig | 1 +
configs/nitrogen6s_defconfig | 1 +
configs/riotboard_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/wandboard_defconfig | 1 +
include/configs/MIP405.h | 1 -
include/configs/MigoR.h | 1 -
include/configs/PIP405.h | 1 -
include/configs/advantech_dms-ba16.h | 1 -
include/configs/ap325rxa.h | 1 -
include/configs/ap_sh4a_4a.h | 1 -
include/configs/aristainetos-common.h | 1 -
include/configs/armadillo-800eva.h | 1 -
include/configs/bur_cfg_common.h | 1 -
include/configs/cgtqmx6eval.h | 1 -
include/configs/ea20.h | 1 -
include/configs/ecovec.h | 1 -
include/configs/embestmx6boards.h | 1 -
include/configs/ge_bx50v3.h | 2 --
include/configs/kzm9g.h | 1 -
include/configs/ms7722se.h | 1 -
include/configs/mx51evk.h | 1 -
include/configs/mx53loco.h | 1 -
include/configs/mx6sabre_common.h | 1 -
include/configs/nitrogen6x.h | 1 -
include/configs/r0p7734.h | 1 -
include/configs/rcar-gen2-common.h | 1 -
include/configs/rcar-gen3-common.h | 1 -
include/configs/sh7752evb.h | 1 -
include/configs/sh7753evb.h | 1 -
include/configs/sh7757lcr.h | 1 -
include/configs/sh7785lcr.h | 1 -
include/configs/socfpga_common.h | 1 -
include/configs/wandboard.h | 1 -
scripts/config_whitelist.txt | 1 -
76 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/README b/README
index 7091429..2342484 100644
--- a/README
+++ b/README
@@ -3585,9 +3585,6 @@ Configuration Settings:
- CONFIG_SYS_CONSOLE_INFO_QUIET
Suppress display of console information at boot.
-- CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
- Enable the call to overwrite_console().
-
- CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END:
Begin and End addresses of the area used by the
simple memory test.
diff --git a/common/Kconfig b/common/Kconfig
index 5c0441b..46e93a9 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -309,6 +309,15 @@ config SYS_CONSOLE_IS_IN_ENV
environment variables can be updated after boot to change the
input/output devices.
+config SYS_CONSOLE_OVERWRITE_ROUTINE
+ bool "Allow board control over console overwriting"
+ help
+ If this is enabled, and the board-specific function
+ overwrite_console() returns 1, the stdin, stderr and stdout are
+ switched to the serial port, else the settings in the environment
+ are used. If this is not enabled, the console will not be switched
+ to serial.
+
config SYS_CONSOLE_ENV_OVERWRITE
bool "Update environment variables during console init"
help
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index ff19c50..b3a11ce 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -5,6 +5,7 @@ CONFIG_4xx=y
CONFIG_TARGET_MIP405T=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index be9ba32..59f77d6 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -5,6 +5,7 @@ CONFIG_4xx=y
CONFIG_TARGET_MIP405=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 74c67ac..f0ca08b 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -5,6 +5,7 @@ CONFIG_4xx=y
CONFIG_TARGET_PIP405=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index b7443d9..dbb5374 100644
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -6,6 +6,7 @@ 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_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
index d365606..66e3985 100644
--- a/configs/aristainetos2b_defconfig
+++ b/configs/aristainetos2b_defconfig
@@ -6,6 +6,7 @@ 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_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index a1d2c4e..7e68d48 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -6,6 +6,7 @@ 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_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 0a3ea12..6a349ea 100644
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -13,6 +13,7 @@ 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_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 0fabecc..eec3848 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -13,6 +13,7 @@ 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_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index 09fd2df..07f7d35 100644
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -16,6 +16,7 @@ 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_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index 27cdb62..4851003 100644
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -11,6 +11,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
CONFIG_BOOTDELAY=-2
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index 85080b6..3499914 100644
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -16,6 +16,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index f0dcb1d..3236788 100644
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_DDR_1G=y
CONFIG_VIDEO=y
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index 468b3a7..2c14ce5 100644
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_ADVANTECH_DMS_BA16=y
CONFIG_VIDEO=y
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 13411c6..b70b421 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_EA20=y
CONFIG_VIDEO=y
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ea20 > "
diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig
index 29010f3..117f68d 100644
--- a/configs/ge_b450v3_defconfig
+++ b/configs/ge_b450v3_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_GE_B450V3=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig
index e0eeb46..73b559b 100644
--- a/configs/ge_b650v3_defconfig
+++ b/configs/ge_b650v3_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_GE_B650V3=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig
index 9b4b917..80d5315 100644
--- a/configs/ge_b850v3_defconfig
+++ b/configs/ge_b850v3_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_GE_B850V3=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index bc76dfd..4104164 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -4,6 +4,7 @@ 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_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index 02cbf57..4bba151 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -4,6 +4,7 @@ CONFIG_VIDEO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index f42758e..3422ccb 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -4,6 +4,7 @@ CONFIG_VIDEO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index 68c1a6b..49c2161 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index 1dbfe53..b380342 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
index 1445b75..a523632 100644
--- a/configs/mx6qpsabreauto_defconfig
+++ b/configs/mx6qpsabreauto_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 004206b..c7e1f4f 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 3dab823..d4e3c3d 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 0f3cc7a..e377284 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index 6d58495..147d2b3 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -14,6 +14,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index d1be7b5..33c6da7 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 6212755..a39e502 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index d05608e..7dacaeb 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 452a16c..63ceb01 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 158df5d..094fe5a 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index fb8fa4c..ad58fa4 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -5,6 +5,7 @@ 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
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index 9ad02e4..22ebf5c 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -4,6 +4,7 @@ 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_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index d896861..f4945d1 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index c6f7fd4..eeee9a0 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
index 32ba494..c303e3a 100644
--- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig
index a683b2d..faa3cb1 100644
--- a/configs/socfpga_is1_defconfig
+++ b/configs/socfpga_is1_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig
index 6dc4b10..43bb85c 100644
--- a/configs/socfpga_mcvevk_defconfig
+++ b/configs/socfpga_mcvevk_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig
index eb6304a..8c11ae8 100644
--- a/configs/socfpga_sockit_defconfig
+++ b/configs/socfpga_sockit_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index 6a8becc..4d50971 100644
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
index 5296c78..15d9d9b 100644
--- a/configs/socfpga_sr1500_defconfig
+++ b/configs/socfpga_sr1500_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index eedf750..c8e1c3b 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
CONFIG_FIT=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 329d5e4..affaa5f 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -13,6 +13,7 @@ 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_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 8ad34b1..1a4d602 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -108,7 +108,6 @@
/***************************************************************
* defines if an overwrite_console function exists
*************************************************************/
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_CONSOLE_INFO_QUIET
/***************************************************************
* defines if the overwrite_console should be stored in the
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 588ddd4..b31d51b 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -42,7 +42,6 @@
#define CONFIG_CONS_SCIF0 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console
information at boot */
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_MEMTEST_START (MIGO_R_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index b77aacb..5f7706df 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -104,7 +104,6 @@
/***************************************************************
* defines if an overwrite_console function exists
*************************************************************/
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_CONSOLE_INFO_QUIET
/***************************************************************
* defines if the overwrite_console should be stored in the
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 2cbbac2..bbf97c7 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -276,7 +276,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 795a7d2..153d162 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -56,7 +56,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_MEMTEST_START (AP325RXA_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index fc08d7b..e922cdf 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -72,7 +72,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 93083fc..56530fd 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -231,7 +231,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
/* check this console not needed, after test remove it */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 175a124..e6761c3 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -61,7 +61,6 @@
#define SCIF4_BASE 0xe6c80000
#define CONFIG_SCIF_A
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_MEMTEST_START (ARMADILLO_800EVA_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index 277f36e..16237e6 100644
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -41,7 +41,6 @@
#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
/* As stated above, the following choices are optional. */
#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index b016f20..d474bc1 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -89,7 +89,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 8c35688..e3fdc5e 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -108,7 +108,6 @@
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CMD_BMP
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#endif
/*
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 8ab26e6..dd925a9 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -92,7 +92,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 9e0c945..2106e86 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -118,7 +118,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index c1053f8..a3c2bd4 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -302,8 +302,6 @@
#define CONFIG_SYS_FSL_USDHC_NUM 3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-
/* Framebuffer */
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 921474f..0aff6e8 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -57,7 +57,6 @@
#define CONFIG_SCIF_CONSOLE
#define CONFIG_CONS_SCIF4
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_MEMTEST_START (KZM_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END \
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index d0b6e58..17485b5 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -41,7 +41,6 @@
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF0 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console information at boot */
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_MEMTEST_START (MS7722SE_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 968662d..fda8bfe 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -97,7 +97,6 @@
/* Framebuffer and LCD */
#define CONFIG_PREBOOT
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_BMP_16BPP
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 258a856..5628943 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -216,7 +216,6 @@
/* Framebuffer and LCD */
#define CONFIG_PREBOOT
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_BMP_16BPP
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 9a0b0a2..e404d5b 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -209,7 +209,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 63ef4e7..b32e49e 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -93,7 +93,6 @@
/* Framebuffer and LCD */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index 408ae21..d7ecdb8 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -77,7 +77,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index ccd5026..e02e2d1 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -43,7 +43,6 @@
/* console */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 256
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index a435708..a397e64 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -51,7 +51,6 @@
/* console */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 256
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index fd32ddc..bdb8101 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -45,7 +45,6 @@
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF2 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_MEMTEST_START (SH7752EVB_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 57c8e76..eaa862c 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -45,7 +45,6 @@
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF2 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_MEMTEST_START (SH7753EVB_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index cb09a7c..8e4ff1c 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -45,7 +45,6 @@
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF2 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_MEMTEST_START (SH7757LCR_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 6eee51e..86057c1 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -61,7 +61,6 @@
#define CONFIG_CONS_SCIF1 1
#define CONFIG_SCIF_EXT_CLOCK 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_MEMTEST_START (SH7785LCR_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 386c891..028743b 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -252,7 +252,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
/*
* U-Boot environment
*/
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#if !defined(CONFIG_ENV_SIZE)
#define CONFIG_ENV_SIZE 4096
#endif
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 4d219e2..84e08e8 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -75,7 +75,6 @@
/* Framebuffer */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c0fcd65..f4b353a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4611,7 +4611,6 @@ CONFIG_SYS_CMXFCR_VALUE2
CONFIG_SYS_CMXFCR_VALUE3
CONFIG_SYS_CMXSCR_VALUE
CONFIG_SYS_CONSOLE_INFO_QUIET
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
CONFIG_SYS_CORE_SRAM
CONFIG_SYS_CORE_SRAM_SIZE
CONFIG_SYS_CORTEX_R4
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (25 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 26/29] Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-09-30 5:24 ` Heiko Schocher
2016-10-01 2:39 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 28/29] Convert CONFIG_USB_KEYBOARD " Simon Glass
` (2 subsequent siblings)
29 siblings, 2 replies; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_INFO_QUIET
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v3: None
Changes in v2:
- Make CONFIG_SYS_CONSOLE_INFO_QUIET the default if !CONFIG_MUX
README | 3 ---
common/Kconfig | 9 +++++++++
configs/MIP405T_defconfig | 1 +
configs/MIP405_defconfig | 1 +
configs/PIP405_defconfig | 1 +
configs/bayleybay_defconfig | 1 +
configs/brppt1_mmc_defconfig | 1 +
configs/brppt1_nand_defconfig | 1 +
configs/brppt1_spi_defconfig | 1 +
configs/brxre1_defconfig | 1 +
configs/chromebook_link_defconfig | 1 +
configs/chromebook_samus_defconfig | 1 +
configs/chromebox_panther_defconfig | 1 +
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
configs/conga-qeval20-qa3-e3845_defconfig | 1 +
configs/coreboot-x86_defconfig | 1 +
configs/cougarcanyon2_defconfig | 1 +
configs/crownbay_defconfig | 1 +
configs/dfi-bt700-q7x-151_defconfig | 1 +
configs/ea20_defconfig | 1 +
configs/efi-x86_defconfig | 1 +
configs/galileo_defconfig | 1 +
configs/icon_defconfig | 1 +
configs/lwmon5_defconfig | 1 +
configs/minnowmax_defconfig | 1 +
configs/pxm2_defconfig | 1 +
configs/qemu-x86_defconfig | 1 +
configs/qemu-x86_efi_payload32_defconfig | 1 +
configs/qemu-x86_efi_payload64_defconfig | 1 +
configs/rut_defconfig | 1 +
configs/som-db5800-som-6867_defconfig | 1 +
configs/theadorable-x86-dfi-bt700_defconfig | 1 +
configs/theadorable_debug_defconfig | 1 +
configs/theadorable_defconfig | 1 +
include/configs/10m50_devboard.h | 1 -
include/configs/3c120_devboard.h | 1 -
include/configs/CPCI2DP.h | 2 --
include/configs/CPCI4052.h | 2 +-
include/configs/M5249EVB.h | 1 -
include/configs/MIP405.h | 1 -
include/configs/MigoR.h | 2 --
include/configs/PIP405.h | 1 -
include/configs/PLU405.h | 2 --
include/configs/PMC405DE.h | 1 -
include/configs/VOM405.h | 2 --
include/configs/a3m071.h | 2 --
include/configs/amcc-common.h | 1 -
include/configs/amcore.h | 1 -
include/configs/ap325rxa.h | 1 -
include/configs/ap_sh4a_4a.h | 1 -
include/configs/armadillo-800eva.h | 1 -
include/configs/bur_cfg_common.h | 1 -
include/configs/clearfog.h | 1 -
include/configs/db-88f6720.h | 1 -
include/configs/db-88f6820-amc.h | 1 -
include/configs/db-88f6820-gp.h | 1 -
include/configs/db-mv784mp-gp.h | 1 -
include/configs/ea20.h | 1 -
include/configs/ecovec.h | 1 -
include/configs/hrcon.h | 2 --
include/configs/kzm9g.h | 1 -
include/configs/lsxl.h | 1 -
include/configs/lwmon5.h | 2 --
include/configs/maxbcm.h | 1 -
include/configs/ms7722se.h | 1 -
include/configs/mvebu_db-88f3720.h | 1 -
include/configs/mvebu_db-88f7040.h | 1 -
include/configs/odroid.h | 1 -
include/configs/openrisc-generic.h | 1 -
include/configs/origen.h | 1 -
include/configs/r0p7734.h | 1 -
include/configs/rcar-gen2-common.h | 1 -
include/configs/rcar-gen3-common.h | 1 -
include/configs/s5pc210_universal.h | 1 -
include/configs/sh7752evb.h | 1 -
include/configs/sh7753evb.h | 1 -
include/configs/sh7757lcr.h | 1 -
include/configs/sh7785lcr.h | 1 -
include/configs/siemens-am33x-common.h | 1 -
include/configs/socfpga_sr1500.h | 1 -
include/configs/spear-common.h | 1 -
include/configs/strider.h | 2 --
include/configs/theadorable.h | 1 -
include/configs/ti814x_evm.h | 1 -
include/configs/ti816x_evm.h | 1 -
include/configs/ti_armv7_common.h | 1 -
include/configs/trats.h | 1 -
include/configs/trats2.h | 1 -
include/configs/vct.h | 1 -
include/configs/x600.h | 1 -
include/configs/x86-common.h | 2 --
include/configs/xilinx-ppc.h | 1 -
include/configs/xpress.h | 1 -
scripts/config_whitelist.txt | 1 -
94 files changed, 42 insertions(+), 72 deletions(-)
diff --git a/README b/README
index 2342484..f0c1309 100644
--- a/README
+++ b/README
@@ -3582,9 +3582,6 @@ Configuration Settings:
- CONFIG_SYS_BAUDRATE_TABLE:
List of legal baudrate settings for this board.
-- CONFIG_SYS_CONSOLE_INFO_QUIET
- Suppress display of console information at boot.
-
- CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END:
Begin and End addresses of the area used by the
simple memory test.
diff --git a/common/Kconfig b/common/Kconfig
index 46e93a9..ae93143 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -327,6 +327,15 @@ config SYS_CONSOLE_ENV_OVERWRITE
start-up (after relocation). This causes the environment to be
updated to match the console devices actually chosen.
+config SYS_CONSOLE_INFO_QUIET
+ bool "Don't display the console devices on boot"
+ default y if !CONSOLE_MUX
+ help
+ Normally U-Boot displays the current settings for stdout, stdin
+ and stderr on boot when the post-relocation console is set up.
+ Enable this option to supress this output. It can be obtained by
+ calling stdio_print_current_devices() from board code.
+
endmenu
config SYS_NO_FLASH
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index b3a11ce..51235b2 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405T=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index 59f77d6..5977c16 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_MIP405=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index f0ca08b..63dca82 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_PIP405=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index e6d8418c..4bc2419 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -17,6 +17,7 @@ CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 6a349ea..021fa62 100644
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
CONFIG_BOOTDELAY=-2
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index eec3848..18fdcad 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
CONFIG_BOOTDELAY=-2
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index 07f7d35..6a63db5 100644
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -17,6 +17,7 @@ CONFIG_SPI_BOOT=y
CONFIG_BOOTDELAY=-2
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index 4851003..afdb132 100644
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
CONFIG_BOOTDELAY=-2
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 7922fcc..7628e1e 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -12,6 +12,7 @@ CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig
index 7e9857e..72b864e 100644
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -10,6 +10,7 @@ CONFIG_SMP=y
CONFIG_HAVE_VGA_BIOS=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index acc1038..473b191 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -10,6 +10,7 @@ CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 7cb935e..64a90b9 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -17,6 +17,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 9209ed0..649f871 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index f640c5a..b83f869 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -6,6 +6,7 @@ CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index cfd868d..949a8fc 100644
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -3,6 +3,7 @@ CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="cougarcanyon2"
CONFIG_TARGET_COUGARCANYON2=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 0ec3851..447ff7d 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -10,6 +10,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_FIT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 414c615..8552f9c 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index b70b421..973a542 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ea20 > "
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index c47f314..ce4ca84 100644
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -4,6 +4,7 @@ CONFIG_DEFAULT_DEVICE_TREE="efi"
CONFIG_TARGET_EFI=y
CONFIG_FIT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BOOTM is not set
# CONFIG_CMD_IMLS is not set
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index ef6ce97..c66f24a 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -10,6 +10,7 @@ CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index 669dc2a..4479dbb 100644
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -4,6 +4,7 @@ CONFIG_4xx=y
CONFIG_TARGET_ICON=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=5
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_ASKENV=y
diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig
index 0282d28..4e59303 100644
--- a/configs/lwmon5_defconfig
+++ b/configs/lwmon5_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_ASKENV=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index ebfcab7..0e40c49 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -17,6 +17,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 8b0e999..0d0a7d3 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -18,6 +18,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50"
CONFIG_FIT=y
CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot# "
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 3acdaeb..d419039 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -10,6 +10,7 @@ CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index 13b1fef..f1096ee 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index 8d48afa..ea3796b 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index ecc3e72..d73b3a5 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -18,6 +18,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_DEFAULT_DEVICE_TREE="am335x-rut"
CONFIG_FIT=y
CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot# "
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index ba97a8e..fcd5b20 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 446ce7a..d3f290e 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 51deddc..a400d6d 100644
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -13,6 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_FIT=y
CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig
index 9c7a79f..61ba811 100644
--- a/configs/theadorable_defconfig
+++ b/configs/theadorable_defconfig
@@ -13,6 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_FIT=y
CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SPL=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index ebe018a..c79e89a 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -19,7 +19,6 @@
* SERIAL
*/
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress console info */
#define CONFIG_SYS_NS16550_MEM32
/*
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index b2126a6..8835522 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -19,7 +19,6 @@
* SERIAL
*/
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress console info */
/*
* CFI Flash
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 603de33..ea65bd4 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -75,8 +75,6 @@
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup*/
-
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_SYS_MEMTEST_START 0x0400000 /* memtest works on */
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index afaf739..d2e5ce0 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -96,7 +96,7 @@
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup*/
+#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_SYS_MEMTEST_START 0x0400000 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x0C00000 /* 4 ... 12 MB in DRAM */
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 735c4da..d61c68f 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -52,7 +52,6 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup */
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 1a4d602..db92967 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -108,7 +108,6 @@
/***************************************************************
* defines if an overwrite_console function exists
*************************************************************/
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
/***************************************************************
* defines if the overwrite_console should be stored in the
* environment
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index b31d51b..bb12785 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -40,8 +40,6 @@
/* SCIF */
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF0 1
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console
- information at boot */
#define CONFIG_SYS_MEMTEST_START (MIGO_R_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 5f7706df..1db7b5d 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -104,7 +104,6 @@
/***************************************************************
* defines if an overwrite_console function exists
*************************************************************/
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
/***************************************************************
* defines if the overwrite_console should be stored in the
* environment
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 53e51e5..071f0a7 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -93,8 +93,6 @@
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup*/
-
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_SYS_MEMTEST_START 0x0400000 /* memtest works on */
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index 0b0db20..b076851 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -74,7 +74,6 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console info */
#define CONFIG_SYS_MEMTEST_START 0x0100000 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x3000000 /* 1 ... 48 MB in DRAM */
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index 5e30511..5dbc1e8 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -83,8 +83,6 @@
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* don't print console @ startup*/
-
#define CONFIG_SYS_MEMTEST_START 0x0400000 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x0C00000 /* 4 ... 12 MB in DRAM */
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index 8bb13ec..640ee9f 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -247,8 +247,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x00100000
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/
-
/*
* Various low-level settings
*/
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index f4261e9..7974c53 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -78,7 +78,6 @@
#define CONFIG_CMDLINE_EDITING /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/
#define CONFIG_LOADS_ECHO /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index fcb82e2..4a54cb6 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -51,7 +51,6 @@
/* Boot argument buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* no console @ startup */
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 153d162..9a4d2c9 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -55,7 +55,6 @@
#define CONFIG_CONS_SCIF5 1
/* Suppress display of console information at boot */
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_MEMTEST_START (AP325RXA_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index e922cdf..93205aa 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -71,7 +71,6 @@
#define CONFIG_CONS_SCIF4 1
/* Suppress display of console information at boot */
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index e6761c3..817ddab 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -60,7 +60,6 @@
#define SCIF2_BASE 0xe6c60000
#define SCIF4_BASE 0xe6c80000
#define CONFIG_SCIF_A
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_MEMTEST_START (ARMADILLO_800EVA_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index 16237e6..5c99860 100644
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -39,7 +39,6 @@
#define CONFIG_NETCONSOLE 1
#define CONFIG_BOOTP_MAY_FAIL /* if we don't have DHCP environment */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */
/* As stated above, the following choices are optional. */
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 3990900..21b391b 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -87,7 +87,6 @@
#define CONFIG_PCI_SCAN_SHOW
#endif
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
/* Keep device tree and initrd in lower memory so the kernel can access them */
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index a134889..282d5e8 100644
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -50,7 +50,6 @@
#define CONFIG_PHY_MARVELL /* there is a marvell phy */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
/* Additional FS support/configuration */
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index a6d0221..446596e 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -72,7 +72,6 @@
#define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_NAND_ONFI_DETECTION
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
/* Keep device tree and initrd in lower memory so the kernel can access them */
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 48b4b2e..1f2f6b8 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -88,7 +88,6 @@
#define CONFIG_PCI_SCAN_SHOW
#endif
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
/* Keep device tree and initrd in lower memory so the kernel can access them */
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index c43dece..d81efa9 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -55,7 +55,6 @@
#define CONFIG_PHY_MARVELL /* there is a marvell phy */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
/* SATA support */
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index e3fdc5e..f897145 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -104,7 +104,6 @@
#define CONFIG_VIDEO_DA8XX
#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_VIDEO_LOGO
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_CMD_BMP
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index dd925a9..e1e3c78 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -91,7 +91,6 @@
#define CONFIG_CONS_SCIF0 1
/* Suppress display of console information at boot */
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 99dcb75..c2ffc08 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -539,8 +539,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 0aff6e8..b8f73d6 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -56,7 +56,6 @@
/* SCIF */
#define CONFIG_SCIF_CONSOLE
#define CONFIG_CONS_SCIF4
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_MEMTEST_START (KZM_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END \
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 6084c8e..0caca4c 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -36,7 +36,6 @@
#define CONFIG_KIRKWOOD_GPIO
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
/*
* Enable u-boot API for standalone programs.
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 2fed3e0..638682f 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -426,8 +426,6 @@
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/
-
#ifndef DEBUG
#define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */
#endif
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index 29ed284..9f4308f 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -46,7 +46,6 @@
#define CONFIG_PHY_MARVELL /* there is a marvell phy */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
/*
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 17485b5..a473eec 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -40,7 +40,6 @@
/* SCIF */
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF0 1
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console information at boot */
#define CONFIG_SYS_MEMTEST_START (MS7722SE_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h
index 7a50c4e..7ddde8c 100644
--- a/include/configs/mvebu_db-88f3720.h
+++ b/include/configs/mvebu_db-88f3720.h
@@ -59,7 +59,6 @@
#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
/* End of 16M scrubbed by training in bootrom */
diff --git a/include/configs/mvebu_db-88f7040.h b/include/configs/mvebu_db-88f7040.h
index 709098f..6feb8d7 100644
--- a/include/configs/mvebu_db-88f7040.h
+++ b/include/configs/mvebu_db-88f7040.h
@@ -62,7 +62,6 @@
#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
/* End of 16M scrubbed by training in bootrom */
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 704d1e7..2828f07 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -43,7 +43,6 @@
#define CONFIG_BAUDRATE 115200
/* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_BOOTARGS "Please use defined boot"
#define CONFIG_BOOTCOMMAND "run autoboot"
diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h
index 227c0ca..9decae7 100644
--- a/include/configs/openrisc-generic.h
+++ b/include/configs/openrisc-generic.h
@@ -38,7 +38,6 @@
#define CONFIG_BAUDRATE CONFIG_SYS_UART_BAUD
#define CONFIG_SYS_BAUDRATE_TABLE {CONFIG_BAUDRATE}
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress console info */
#define CONSOLE_ARG "console=console=ttyS0,115200\0"
/*
diff --git a/include/configs/origen.h b/include/configs/origen.h
index a075b54..26fe402 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -37,7 +37,6 @@
#define CONFIG_BAUDRATE 115200
/* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index d7ecdb8..0552003 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -76,7 +76,6 @@
#define CONFIG_CONS_SCIF3 1
/* Suppress display of console information@boot */
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index e02e2d1..2d5c638 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -42,7 +42,6 @@
#define CONFIG_SH_GPIO_PFC
/* console */
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 256
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index a397e64..29685ed 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -50,7 +50,6 @@
#define CONFIG_SH_GPIO_PFC
/* console */
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 256
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index e2d814f..0210c5b 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -29,7 +29,6 @@
#define CONFIG_BAUDRATE 115200
/* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_BOOTARGS "Please use defined boot"
#define CONFIG_BOOTCOMMAND "run mmcboot"
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index bdb8101..38bf408 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -44,7 +44,6 @@
/* SCIF */
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF2 1
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_MEMTEST_START (SH7752EVB_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index eaa862c..3718bc5 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -44,7 +44,6 @@
/* SCIF */
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF2 1
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_MEMTEST_START (SH7753EVB_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 8e4ff1c..8820e15 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -44,7 +44,6 @@
/* SCIF */
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF2 1
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_MEMTEST_START (SH7757LCR_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 86057c1..11a4cf9 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -60,7 +60,6 @@
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF1 1
#define CONFIG_SCIF_EXT_CLOCK 1
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_MEMTEST_START (SH7785LCR_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index c53bd66..7de3cf6 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -110,7 +110,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SERIAL1 1
#define CONFIG_CONS_INDEX 1
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 286e746..0407f03 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -25,7 +25,6 @@
#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot"
#define CONFIG_LOADADDR 0x01000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
/* Ethernet on SoC (EMAC) */
#define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index a6973c5..c201d0a 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -190,7 +190,6 @@
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR 0x00800000
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_FLASH_EMPTY_INFO
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 5cd37d7..92ad95e 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -573,8 +573,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index fe2ca6f..a51ffb5 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -63,7 +63,6 @@
#define CONFIG_PHY_MARVELL /* there is a marvell phy */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
#define CONFIG_PREBOOT
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 22a8e4f..e7f4fba 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -149,7 +149,6 @@
#define CONFIG_ENV_OVERWRITE
#define CONFIG_CONS_INDEX 1
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_ENV_IS_NOWHERE
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index b3215a2..26998d7 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -114,7 +114,6 @@
#define CONFIG_SERIAL2
#define CONFIG_SERIAL3
#define CONFIG_CONS_INDEX 1
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_ENV_IS_NOWHERE
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index f039df5..1b6d4ad 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -147,7 +147,6 @@
* console baudrate of 115200 and use the default baud rate table.
*/
#define CONFIG_SYS_MALLOC_LEN SZ_32M
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_BAUDRATE 115200
#define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */
#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 9fc6513..a26d663 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -41,7 +41,6 @@
#define CONFIG_BAUDRATE 115200
/* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
/* MACH_TYPE_TRATS macro will be removed once added to mach-types */
#define MACH_TYPE_TRATS 3928
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index c437c13..1633c67 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -38,7 +38,6 @@
#define CONFIG_BAUDRATE 115200
/* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_BOOTARGS "Please use defined boot"
#define CONFIG_BOOTCOMMAND "run autoboot"
diff --git a/include/configs/vct.h b/include/configs/vct.h
index f2e0e5c..ef0d648 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -142,7 +142,6 @@
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_CMDLINE_EDITING /* add command line history */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/
/*
* FLASH and environment organization
diff --git a/include/configs/x600.h b/include/configs/x600.h
index f15b1f9..088ad90 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -156,7 +156,6 @@
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR 0x00800000
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
/* Use last 2 lwords in internal SRAM for bootcounter */
#define CONFIG_BOOTCOUNT_LIMIT
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index ebb257b..7742020 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -84,8 +84,6 @@
#endif
#define CONFIG_PARTITION_UUIDS
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
/* x86 GPIOs are accessed through a PCI device */
#define CONFIG_INTEL_ICH6_GPIO
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index 6c52582..47c1ddf 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -57,7 +57,6 @@
#define CONFIG_CMDLINE_EDITING /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_LOADS_ECHO /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */
#define CONFIG_SYS_BOOTMAPSZ (8 << 20)
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index dd28e6a..3ea588a 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -45,7 +45,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_CMDLINE_EDITING
/* Physical Memory Map */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f4b353a..94b3108 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4610,7 +4610,6 @@ CONFIG_SYS_CMXFCR_VALUE1
CONFIG_SYS_CMXFCR_VALUE2
CONFIG_SYS_CMXFCR_VALUE3
CONFIG_SYS_CMXSCR_VALUE
-CONFIG_SYS_CONSOLE_INFO_QUIET
CONFIG_SYS_CORE_SRAM
CONFIG_SYS_CORE_SRAM_SIZE
CONFIG_SYS_CORTEX_R4
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 28/29] Convert CONFIG_USB_KEYBOARD to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (26 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 29/29] Convert CONFIG_SYS_STDIO_DEREGISTER " Simon Glass
2016-10-13 14:02 ` [U-Boot] [PATCH v3 00/29] Kconfig: Move console options " Tom Rini
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_USB_KEYBOARD
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v3: None
Changes in v2:
- Add new patch to convert CONFIG_USB_KEYBOARD to Kconfig
configs/Cyrus_P5020_defconfig | 1 +
configs/Cyrus_P5040_defconfig | 1 +
configs/MIP405_defconfig | 1 +
configs/PIP405_defconfig | 1 +
configs/VCMA9_defconfig | 1 +
configs/at91rm9200ek_defconfig | 1 +
configs/at91rm9200ek_ram_defconfig | 1 +
configs/bayleybay_defconfig | 1 +
configs/cgtqmx6eval_defconfig | 1 +
configs/chromebook_link_defconfig | 1 +
configs/chromebook_samus_defconfig | 1 +
configs/chromebox_panther_defconfig | 1 +
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
configs/conga-qeval20-qa3-e3845_defconfig | 1 +
configs/coreboot-x86_defconfig | 1 +
configs/cougarcanyon2_defconfig | 1 +
configs/crownbay_defconfig | 1 +
configs/dfi-bt700-q7x-151_defconfig | 1 +
configs/dms-ba16-1g_defconfig | 1 +
configs/dms-ba16_defconfig | 1 +
configs/efi-x86_defconfig | 1 +
configs/galileo_defconfig | 1 +
configs/gwventana_defconfig | 1 +
configs/minnowmax_defconfig | 1 +
configs/mx6cuboxi_defconfig | 1 +
configs/mx6qsabrelite_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/novena_defconfig | 1 +
configs/qemu-x86_defconfig | 1 +
configs/qemu-x86_efi_payload32_defconfig | 1 +
configs/qemu-x86_efi_payload64_defconfig | 1 +
configs/rpi_2_defconfig | 1 +
configs/rpi_3_32b_defconfig | 1 +
configs/rpi_3_defconfig | 1 +
configs/rpi_defconfig | 1 +
configs/seaboard_defconfig | 1 +
configs/smdk2410_defconfig | 1 +
configs/som-db5800-som-6867_defconfig | 1 +
configs/tbs2910_defconfig | 1 +
configs/theadorable-x86-dfi-bt700_defconfig | 1 +
configs/ventana_defconfig | 1 +
include/configs/MIP405.h | 1 -
include/configs/MPC8610HPCD.h | 1 -
include/configs/MPC8641HPCN.h | 1 -
include/configs/PIP405.h | 1 -
include/configs/VCMA9.h | 1 -
include/configs/advantech_dms-ba16.h | 1 -
include/configs/at91rm9200ek.h | 1 -
include/configs/cgtqmx6eval.h | 1 -
include/configs/cyrus.h | 1 -
include/configs/ge_bx50v3.h | 1 -
include/configs/gw_ventana.h | 1 -
include/configs/mx6cuboxi.h | 1 -
include/configs/nitrogen6x.h | 1 -
include/configs/novena.h | 1 -
include/configs/rpi.h | 1 -
include/configs/seaboard.h | 1 -
include/configs/smdk2410.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/ventana.h | 1 -
include/configs/x86-common.h | 1 -
66 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/configs/Cyrus_P5020_defconfig b/configs/Cyrus_P5020_defconfig
index 6495440..5eb56602 100644
--- a/configs/Cyrus_P5020_defconfig
+++ b/configs/Cyrus_P5020_defconfig
@@ -26,4 +26,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/Cyrus_P5040_defconfig b/configs/Cyrus_P5040_defconfig
index 4566abb..e33340b 100644
--- a/configs/Cyrus_P5040_defconfig
+++ b/configs/Cyrus_P5040_defconfig
@@ -26,4 +26,5 @@ CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index 5977c16..939687c 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -19,5 +19,6 @@ CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_VIDEO_CT69000=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 63dca82..9b4c38c 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -19,5 +19,6 @@ CONFIG_CMD_FAT=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_VIDEO_CT69000=y
diff --git a/configs/VCMA9_defconfig b/configs/VCMA9_defconfig
index da568a1..e464c21 100644
--- a/configs/VCMA9_defconfig
+++ b/configs/VCMA9_defconfig
@@ -14,3 +14,4 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_UBI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig
index e4f7196..293cab0 100644
--- a/configs/at91rm9200ek_defconfig
+++ b/configs/at91rm9200ek_defconfig
@@ -14,4 +14,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig
index c04cd73..c5466d4 100644
--- a/configs/at91rm9200ek_ram_defconfig
+++ b/configs/at91rm9200ek_ram_defconfig
@@ -15,4 +15,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 4bc2419..f53a4ce 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -56,6 +56,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index 3499914..82e972a 100644
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -44,6 +44,7 @@ CONFIG_DFU_MMC=y
CONFIG_DFU_SF=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 7628e1e..14503f8 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -60,6 +60,7 @@ CONFIG_TPM_TIS_LPC=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig
index 72b864e..ca882e4 100644
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -57,6 +57,7 @@ CONFIG_TPM_TIS_LPC=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_DM_VIDEO=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 473b191..579eb01 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -52,6 +52,7 @@ CONFIG_TPM_TIS_LPC=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 64a90b9..7ccd033 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -64,6 +64,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 649f871..c9488fd 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -63,6 +63,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index b83f869..8b9c54c 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -43,6 +43,7 @@ CONFIG_TPM_TIS_LPC=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_TPM=y
diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index 949a8fc..233fe09 100644
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -34,4 +34,5 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 447ff7d..0a4eab5 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -50,6 +50,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_CFB_CONSOLE=y
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 8552f9c..be822d6 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -61,6 +61,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index 3236788..3ccba12 100644
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_USB=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index 2c14ce5..e765403 100644
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_USB=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index ce4ca84..b31c73b 100644
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -32,4 +32,5 @@ CONFIG_ICH_SPI=y
CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_EFI=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index c66f24a..0220357 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -50,4 +50,5 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 678d803..1625eed 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -48,6 +48,7 @@ CONFIG_E1000=y
CONFIG_DM_SERIAL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 0e40c49..ed08d36 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -60,6 +60,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 59ae1a1..6fb3d98 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -34,4 +34,5 @@ CONFIG_DM=y
CONFIG_DM_THERMAL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index d4e3c3d..14e2f1f 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -33,6 +33,7 @@ CONFIG_SPI_FLASH_SST=y
CONFIG_DM_THERMAL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 33c6da7..b6e0c46 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index a39e502..5b9c13e 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 7dacaeb..b9bd0be 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 63ceb01..2d90ed5 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 094fe5a..1806c48 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index ad58fa4..cd0aeff 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index f0116f8..81c0297 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index d419039..6c1038a 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -47,6 +47,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index f1096ee..188bd7b 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -44,6 +44,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index ea3796b..fd6a5e3 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -44,6 +44,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 4a30450..59bfd05 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index b622afe..d37f40f 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_FS_GENERIC=y
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index df639aa..3e13f20 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_FS_GENERIC=y
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index f0418f0..00fdc71 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 230c4b8..5859550 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -38,6 +38,7 @@ CONFIG_DM_USB=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y
CONFIG_CONSOLE_SCROLL_LINES=10
diff --git a/configs/smdk2410_defconfig b/configs/smdk2410_defconfig
index 1cb7960..da2be2d 100644
--- a/configs/smdk2410_defconfig
+++ b/configs/smdk2410_defconfig
@@ -13,3 +13,4 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_UBI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index fcd5b20..efa2ae8 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -58,6 +58,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 8c342eb..d63bd6e 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -32,6 +32,7 @@ CONFIG_DM=y
CONFIG_DM_THERMAL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index d3f290e..4973dcc 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -58,6 +58,7 @@ CONFIG_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_114=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index aac1818..3da92f4 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -37,6 +37,7 @@ CONFIG_DM_USB=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y
CONFIG_CONSOLE_SCROLL_LINES=10
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index db92967..0538332 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -346,7 +346,6 @@
************************************************************/
#if !defined(CONFIG_TARGET_MIP405T)
#define CONFIG_USB_UHCI
-#define CONFIG_USB_KEYBOARD
/* Enable needed helper functions */
#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 7882b35..b047466 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -285,7 +285,6 @@
************************************************************/
#define CONFIG_PCI_OHCI 1
#define CONFIG_USB_OHCI_NEW 1
-#define CONFIG_USB_KEYBOARD 1
#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL 1
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci"
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 2c15f3d..fe0868f 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -363,7 +363,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
************************************************************/
#define CONFIG_PCI_OHCI 1
#define CONFIG_USB_OHCI_NEW 1
-#define CONFIG_USB_KEYBOARD 1
#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL 1
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci"
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 1db7b5d..eaa8b26 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -306,7 +306,6 @@
* USB support
************************************************************/
#define CONFIG_USB_UHCI
-#define CONFIG_USB_KEYBOARD
/* Enable needed helper functions */
#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 913b099..b570fd3 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -100,7 +100,6 @@
/* USB support (currently only works with D-cache off) */
#define CONFIG_USB_OHCI
#define CONFIG_USB_OHCI_S3C24XX
-#define CONFIG_USB_KEYBOARD
#define CONFIG_DOS_PARTITION
/* Enable needed helper functions */
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index bbf97c7..304994a 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -72,7 +72,6 @@
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_USBD_HS
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 3cc8d89..ed0daf5 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -144,7 +144,6 @@
#define CONFIG_USB_ATMEL 1
#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
#define CONFIG_USB_OHCI_NEW 1
-#define CONFIG_USB_KEYBOARD 1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_SYS_USB_OHCI_CPU_INIT 1
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index d474bc1..bccfedf 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -74,7 +74,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_USBD_HS
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 78eb567..31f2437 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -448,7 +448,6 @@
#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_EHCI_IS_TDI
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL
/* _VIA_CONTROL_EP */
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index a3c2bd4..4adb8e2 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -83,7 +83,6 @@
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_CI_UDC
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index d3bc836..ba6b5bc 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -169,7 +169,6 @@
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_KEYBOARD
#define CONFIG_USBD_HS
#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_CDC
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 82957d6..446b3bc 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -52,7 +52,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL
#define CONFIG_PREBOOT \
"if hdmidet; then " \
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index b32e49e..8ab2486 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -85,7 +85,6 @@
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
/* Miscellaneous commands */
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 0983b96..ee4267a 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -142,7 +142,6 @@
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX6
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_USB_HOST_ETHER
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 7fe469c..25a90cc 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -100,7 +100,6 @@
#define CONFIG_USB_ETHER_SMSC95XX
#define CONFIG_TFTP_TSIZE
#define CONFIG_MISC_INIT_R
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL
#define CONFIG_SYS_STDIO_DEREGISTER
#endif
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index fe68437..2b6509a 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -57,7 +57,6 @@
#define CONFIG_KEYBOARD
/* USB keyboard */
-#define CONFIG_USB_KEYBOARD
/* LCD support */
#define CONFIG_SYS_WHITE_ON_BLACK
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index f83a9c8..f5b3690 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -50,7 +50,6 @@
************************************************************/
#define CONFIG_USB_OHCI
#define CONFIG_USB_OHCI_S3C24XX
-#define CONFIG_USB_KEYBOARD
#define CONFIG_DOS_PARTITION
/************************************************************
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 8fdeaa1..890bd69 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -112,7 +112,6 @@
#define CONFIG_USBD_HS
#define CONFIG_USB_FUNCTION_MASS_STORAGE
#endif /* CONFIG_CMD_USB_MASS_STORAGE */
-#define CONFIG_USB_KEYBOARD
#ifdef CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
#define CONFIG_SYS_STDIO_DEREGISTER
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index d3843d4..7a38869 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -42,7 +42,6 @@
/* General networking support */
/* USB keyboard */
-#define CONFIG_USB_KEYBOARD
/* LCD support */
#define CONFIG_SYS_WHITE_ON_BLACK
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 7742020..fa07417 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -166,7 +166,6 @@
#define CONFIG_USB_EHCI_PCI
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 12
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL
#define CONFIG_USB_HOST_ETHER
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 29/29] Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (27 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 28/29] Convert CONFIG_USB_KEYBOARD " Simon Glass
@ 2016-09-29 20:23 ` Simon Glass
2016-10-01 2:38 ` Tom Rini
2016-10-13 14:02 ` [U-Boot] [PATCH v3 00/29] Kconfig: Move console options " Tom Rini
29 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-09-29 20:23 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_SYS_STDIO_DEREGISTER
This option should never be enabled in SPL, so use
CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) when checking the option.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v3: None
Changes in v2:
- Make CONFIG_SYS_STDIO_DEREGISTER the default if USB_KEYBOARD
- Drop Kconfig changes
common/Kconfig | 9 +++++++++
common/stdio.c | 6 +++---
common/usb_kbd.c | 2 +-
configs/MPC8610HPCD_defconfig | 1 +
configs/MPC8641HPCN_36BIT_defconfig | 1 +
configs/MPC8641HPCN_defconfig | 1 +
drivers/serial/serial-uclass.c | 2 +-
include/configs/MIP405.h | 1 -
include/configs/MPC8610HPCD.h | 1 -
include/configs/MPC8641HPCN.h | 1 -
include/configs/PIP405.h | 1 -
include/configs/VCMA9.h | 1 -
include/configs/cm_fx6.h | 1 -
include/configs/cyrus.h | 1 -
include/configs/gr_ep2s60.h | 1 -
include/configs/novena.h | 1 -
include/configs/rpi.h | 1 -
include/configs/sandbox.h | 2 --
include/configs/sunxi-common.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/tegra-common.h | 4 ----
include/configs/x86-common.h | 2 --
include/stdio_dev.h | 2 +-
scripts/config_whitelist.txt | 1 -
24 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index ae93143..936c8bc 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -336,6 +336,15 @@ config SYS_CONSOLE_INFO_QUIET
Enable this option to supress this output. It can be obtained by
calling stdio_print_current_devices() from board code.
+config SYS_STDIO_DEREGISTER
+ bool "Allow deregistering stdio devices"
+ default y if USB_KEYBOARD
+ help
+ Generally there is no need to deregister stdio devices since they
+ are never deactivated. But if a stdio device is used which can be
+ removed (for example a USB keyboard) then this option can be
+ enabled to ensure this is handled correctly.
+
endmenu
config SYS_NO_FLASH
diff --git a/common/stdio.c b/common/stdio.c
index f99cfe7..c849a9a 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -37,7 +37,7 @@ char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
#define CONFIG_SYS_DEVICE_NULLDEV 1
#endif
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
#define CONFIG_SYS_DEVICE_NULLDEV 1
#endif
@@ -177,7 +177,7 @@ int stdio_register(struct stdio_dev *dev)
/* deregister the device "devname".
* returns 0 if success, -1 if device is assigned and 1 if devname not found
*/
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
int stdio_deregister_dev(struct stdio_dev *dev, int force)
{
int l;
@@ -224,7 +224,7 @@ int stdio_deregister(const char *devname, int force)
return stdio_deregister_dev(dev, force);
}
-#endif /* CONFIG_SYS_STDIO_DEREGISTER */
+#endif /* CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) */
int stdio_init_tables(void)
{
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index a9872a6..5f9a64a 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -570,7 +570,7 @@ int drv_usb_kbd_init(void)
/* Deregister the keyboard. */
int usb_kbd_deregister(int force)
{
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
struct stdio_dev *dev;
struct usb_device *usb_kbd_dev;
struct usb_kbd_pdata *data;
diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
index 2c03ba2..1ff4fdb 100644
--- a/configs/MPC8610HPCD_defconfig
+++ b/configs/MPC8610HPCD_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_MPC8610HPCD=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=10
+CONFIG_SYS_STDIO_DEREGISTER=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
index 0c3d60b..dafdf58 100644
--- a/configs/MPC8641HPCN_36BIT_defconfig
+++ b/configs/MPC8641HPCN_36BIT_defconfig
@@ -6,6 +6,7 @@ CONFIG_PHYS_64BIT=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=10
+CONFIG_SYS_STDIO_DEREGISTER=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
index d2250ec..1f7ceb3 100644
--- a/configs/MPC8641HPCN_defconfig
+++ b/configs/MPC8641HPCN_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_MPC8641HPCN=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=10
+CONFIG_SYS_STDIO_DEREGISTER=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 19f38e1..43c028e 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -346,7 +346,7 @@ static int serial_post_probe(struct udevice *dev)
static int serial_pre_remove(struct udevice *dev)
{
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
struct serial_dev_priv *upriv = dev_get_uclass_priv(dev);
if (stdio_deregister_dev(upriv->sdev, 0))
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 0538332..9aba1dd 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -348,7 +348,6 @@
#define CONFIG_USB_UHCI
/* Enable needed helper functions */
-#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
#endif
/************************************************************
* Debug support
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index b047466..9c98738 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -285,7 +285,6 @@
************************************************************/
#define CONFIG_PCI_OHCI 1
#define CONFIG_USB_OHCI_NEW 1
-#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL 1
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci"
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index fe0868f..ef5653f 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -363,7 +363,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
************************************************************/
#define CONFIG_PCI_OHCI 1
#define CONFIG_USB_OHCI_NEW 1
-#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL 1
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci"
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index eaa8b26..8516eb7 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -308,7 +308,6 @@
#define CONFIG_USB_UHCI
/* Enable needed helper functions */
-#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
/************************************************************
* Debug support
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index b570fd3..f58c18b 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -103,7 +103,6 @@
#define CONFIG_DOS_PARTITION
/* Enable needed helper functions */
-#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
/* RTC */
#define CONFIG_RTC_S3C24X0
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 325c019..8b1e30d 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -211,7 +211,6 @@
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */
-#define CONFIG_SYS_STDIO_DEREGISTER
/* I2C */
#define CONFIG_SYS_I2C
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 31f2437..474eef1 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -448,7 +448,6 @@
#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_EHCI_IS_TDI
-#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL
/* _VIA_CONTROL_EP */
#endif
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index fa10676..544e5fc 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -60,7 +60,6 @@
#if USE_GRUSB
#define CONFIG_USB_UHCI
/* Enable needed helper functions */
-#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
#endif
/*
diff --git a/include/configs/novena.h b/include/configs/novena.h
index ee4267a..ecc7e7e 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -142,7 +142,6 @@
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX6
-#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 25a90cc..45c8234 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -101,7 +101,6 @@
#define CONFIG_TFTP_TSIZE
#define CONFIG_MISC_INIT_R
#define CONFIG_SYS_USB_EVENT_POLL
-#define CONFIG_SYS_STDIO_DEREGISTER
#endif
/* Console UART */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index b6533c3..31ab765 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -25,8 +25,6 @@
#define CONFIG_SYS_TIMER_RATE 1000000
#endif
-#define CONFIG_SYS_STDIO_DEREGISTER
-
/*
* Number of bits in a C 'long' on this architecture. Set this to 32 when
* building on a 32-bit machine.
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index a2969e7..efea259 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -349,7 +349,6 @@ extern int soft_i2c_gpio_scl;
#ifdef CONFIG_USB_KEYBOARD
#define CONFIG_PREBOOT
-#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
#endif
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 890bd69..fba345f 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -114,7 +114,6 @@
#endif /* CONFIG_CMD_USB_MASS_STORAGE */
#ifdef CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
-#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_PREBOOT \
"usb start; " \
"if hdmidet; then " \
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 78024af..0bd6680 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -66,10 +66,6 @@
#define CONFIG_SYS_NO_FLASH
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_SYS_STDIO_DEREGISTER
-#endif
-
/*
* Increasing the size of the IO buffer as default nfsargs size is more
* than 256 and so it is not possible to edit it
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index fa07417..f9b7206 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -62,8 +62,6 @@
9600, 19200, 38400, 115200}
#define CONFIG_SYS_NS16550_PORT_MAPPED
-#define CONFIG_SYS_STDIO_DEREGISTER
-
#define CONFIG_CMDLINE_EDITING
#define CONFIG_COMMAND_HISTORY
#define CONFIG_AUTO_COMPLETE
diff --git a/include/stdio_dev.h b/include/stdio_dev.h
index 13f76be..e4fc8b1 100644
--- a/include/stdio_dev.h
+++ b/include/stdio_dev.h
@@ -100,7 +100,7 @@ int stdio_add_devices(void);
int stdio_init(void);
void stdio_print_current_devices(void);
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
int stdio_deregister(const char *devname, int force);
int stdio_deregister_dev(struct stdio_dev *dev, int force);
#endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 94b3108..ab44b29 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -7694,7 +7694,6 @@ CONFIG_SYS_STACK_LENGTH
CONFIG_SYS_STACK_SIZE
CONFIG_SYS_STATUS_C
CONFIG_SYS_STATUS_OK
-CONFIG_SYS_STDIO_DEREGISTER
CONFIG_SYS_STMICRO_BOOT
CONFIG_SYS_SUPPORT_64BIT_DATA
CONFIG_SYS_SXCNFG_VAL
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 01/29] Remove some merge markers
2016-09-29 20:23 ` [U-Boot] [PATCH v3 01/29] Remove some merge markers Simon Glass
@ 2016-09-30 4:39 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 4:39 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> 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.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> 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(-)
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
>
> diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
> index 43a67a5..261fde0 100644
> --- a/drivers/net/ax88180.c
> +++ b/drivers/net/ax88180.c
> @@ -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;
> diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
> index 0556f32..32874d7 100644
> --- a/drivers/usb/host/isp116x-hcd.c
> +++ b/drivers/usb/host/isp116x-hcd.c
> @@ -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");
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 02/29] Convert SILENT_CONSOLE options to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 02/29] Convert SILENT_CONSOLE options to Kconfig Simon Glass
@ 2016-09-30 4:41 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
1 sibling, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 4:41 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb 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.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> 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!
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
>
> 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(-)
>
> diff --git a/README b/README
> index bc626dc..0a1f3fe 100644
> --- a/README
> +++ b/README
> @@ -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
> diff --git a/common/Kconfig b/common/Kconfig
> index c69c141..bbd5633 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -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
> diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
> index 828bb9b..395330d 100644
> --- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
> +++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig
> index 7767e0d..fd1f2f0 100644
> --- a/configs/T1024QDS_DDR4_defconfig
> +++ b/configs/T1024QDS_DDR4_defconfig
> @@ -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
> diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
> index 7173342..a62560a 100644
> --- a/configs/T1024QDS_NAND_defconfig
> +++ b/configs/T1024QDS_NAND_defconfig
> @@ -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
> diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
> index a1c93ae..5a2f3f9 100644
> --- a/configs/T1024QDS_SDCARD_defconfig
> +++ b/configs/T1024QDS_SDCARD_defconfig
> @@ -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
> diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
> index 371d5f6..04787a0 100644
> --- a/configs/T1024QDS_SECURE_BOOT_defconfig
> +++ b/configs/T1024QDS_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
> index f134850..1a96a63 100644
> --- a/configs/T1024QDS_SPIFLASH_defconfig
> +++ b/configs/T1024QDS_SPIFLASH_defconfig
> @@ -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
> diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
> index b0e9827..6f6fc86 100644
> --- a/configs/T1024QDS_defconfig
> +++ b/configs/T1024QDS_defconfig
> @@ -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
> diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
> index 91beb24..737c648 100644
> --- a/configs/T1024RDB_NAND_defconfig
> +++ b/configs/T1024RDB_NAND_defconfig
> @@ -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
> diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
> index 11aceb8..444d7f8 100644
> --- a/configs/T1024RDB_SDCARD_defconfig
> +++ b/configs/T1024RDB_SDCARD_defconfig
> @@ -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
> diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
> index 70961ec..2eada3f 100644
> --- a/configs/T1024RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1024RDB_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
> index 09fe6c4..2c0f761 100644
> --- a/configs/T1024RDB_SPIFLASH_defconfig
> +++ b/configs/T1024RDB_SPIFLASH_defconfig
> @@ -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
> diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
> index e013fdc..aa24d57 100644
> --- a/configs/T1024RDB_defconfig
> +++ b/configs/T1024RDB_defconfig
> @@ -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
> diff --git a/configs/T1040D4RDB_NAND_defconfig b/configs/T1040D4RDB_NAND_defconfig
> index e9c7708..b1d1159 100644
> --- a/configs/T1040D4RDB_NAND_defconfig
> +++ b/configs/T1040D4RDB_NAND_defconfig
> @@ -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
> diff --git a/configs/T1040D4RDB_SDCARD_defconfig b/configs/T1040D4RDB_SDCARD_defconfig
> index 098ef3b..5a3a00f 100644
> --- a/configs/T1040D4RDB_SDCARD_defconfig
> +++ b/configs/T1040D4RDB_SDCARD_defconfig
> @@ -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
> diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig
> index d727450..e437f3e 100644
> --- a/configs/T1040D4RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig
> index 002346a..55671a6 100644
> --- a/configs/T1040D4RDB_SPIFLASH_defconfig
> +++ b/configs/T1040D4RDB_SPIFLASH_defconfig
> @@ -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
> diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig
> index fc28d1f..f68d6f2 100644
> --- a/configs/T1040D4RDB_defconfig
> +++ b/configs/T1040D4RDB_defconfig
> @@ -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
> diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig
> index 4f470aa..bda4fb3 100644
> --- a/configs/T1040QDS_DDR4_defconfig
> +++ b/configs/T1040QDS_DDR4_defconfig
> @@ -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
> diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
> index ae6aacf..4ec922a 100644
> --- a/configs/T1040QDS_SECURE_BOOT_defconfig
> +++ b/configs/T1040QDS_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
> index dd53bb4..6de7d31 100644
> --- a/configs/T1040QDS_defconfig
> +++ b/configs/T1040QDS_defconfig
> @@ -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
> diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig
> index 9e5a409..e144a88 100644
> --- a/configs/T1040RDB_NAND_defconfig
> +++ b/configs/T1040RDB_NAND_defconfig
> @@ -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
> diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig
> index a43304b..aa3f0f8 100644
> --- a/configs/T1040RDB_SDCARD_defconfig
> +++ b/configs/T1040RDB_SDCARD_defconfig
> @@ -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
> diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
> index e0887de..00e5b12 100644
> --- a/configs/T1040RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1040RDB_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig
> index 1782e07..466bdd7 100644
> --- a/configs/T1040RDB_SPIFLASH_defconfig
> +++ b/configs/T1040RDB_SPIFLASH_defconfig
> @@ -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
> diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig
> index 28b7bb4..422a738 100644
> --- a/configs/T1040RDB_defconfig
> +++ b/configs/T1040RDB_defconfig
> @@ -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
> diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
> index d2772fe..d631eca 100644
> --- a/configs/T1042D4RDB_NAND_defconfig
> +++ b/configs/T1042D4RDB_NAND_defconfig
> @@ -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
> diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
> index f8c5d45..aeea55f 100644
> --- a/configs/T1042D4RDB_SDCARD_defconfig
> +++ b/configs/T1042D4RDB_SDCARD_defconfig
> @@ -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
> diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
> index fa3c412..d6ceeba 100644
> --- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
> index fca6122..66a2c44 100644
> --- a/configs/T1042D4RDB_SPIFLASH_defconfig
> +++ b/configs/T1042D4RDB_SPIFLASH_defconfig
> @@ -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
> diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
> index f611baf..71dabd9 100644
> --- a/configs/T1042D4RDB_defconfig
> +++ b/configs/T1042D4RDB_defconfig
> @@ -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
> diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
> index aa02cec..6d01cf2 100644
> --- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
> +++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
> index 96985ac..0377d25 100644
> --- a/configs/T1042RDB_PI_NAND_defconfig
> +++ b/configs/T1042RDB_PI_NAND_defconfig
> @@ -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
> diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
> index fd5da57..1894c62 100644
> --- a/configs/T1042RDB_PI_SDCARD_defconfig
> +++ b/configs/T1042RDB_PI_SDCARD_defconfig
> @@ -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
> diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
> index bf41ff5..1cb34a5 100644
> --- a/configs/T1042RDB_PI_SPIFLASH_defconfig
> +++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
> @@ -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
> diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
> index 7d70b57..ef8332b 100644
> --- a/configs/T1042RDB_PI_defconfig
> +++ b/configs/T1042RDB_PI_defconfig
> @@ -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
> diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
> index 1539c85..224d1d8 100644
> --- a/configs/T1042RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1042RDB_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig
> index 817c0dc..ee35e43 100644
> --- a/configs/T1042RDB_defconfig
> +++ b/configs/T1042RDB_defconfig
> @@ -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
> diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig
> index 18dddd9..bf4ac25 100644
> --- a/configs/a4m072_defconfig
> +++ b/configs/a4m072_defconfig
> @@ -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"
> diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
> index e04ff5b..f78a88c 100644
> --- a/configs/arndale_defconfig
> +++ b/configs/arndale_defconfig
> @@ -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 # "
> diff --git a/configs/bct-brettl2_defconfig b/configs/bct-brettl2_defconfig
> index ad894a2..5dae665 100644
> --- a/configs/bct-brettl2_defconfig
> +++ b/configs/bct-brettl2_defconfig
> @@ -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
> diff --git a/configs/bf518f-ezbrd_defconfig b/configs/bf518f-ezbrd_defconfig
> index e17c969..7f30237 100644
> --- a/configs/bf518f-ezbrd_defconfig
> +++ b/configs/bf518f-ezbrd_defconfig
> @@ -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
> diff --git a/configs/bf526-ezbrd_defconfig b/configs/bf526-ezbrd_defconfig
> index d3cab9b..663a6a3 100644
> --- a/configs/bf526-ezbrd_defconfig
> +++ b/configs/bf526-ezbrd_defconfig
> @@ -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
> diff --git a/configs/bf527-ad7160-eval_defconfig b/configs/bf527-ad7160-eval_defconfig
> index 45f4149..ccbb148 100644
> --- a/configs/bf527-ad7160-eval_defconfig
> +++ b/configs/bf527-ad7160-eval_defconfig
> @@ -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
> diff --git a/configs/bf527-ezkit-v2_defconfig b/configs/bf527-ezkit-v2_defconfig
> index 3677e0a..d247280 100644
> --- a/configs/bf527-ezkit-v2_defconfig
> +++ b/configs/bf527-ezkit-v2_defconfig
> @@ -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
> diff --git a/configs/bf527-ezkit_defconfig b/configs/bf527-ezkit_defconfig
> index da41fe6..f011277 100644
> --- a/configs/bf527-ezkit_defconfig
> +++ b/configs/bf527-ezkit_defconfig
> @@ -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
> diff --git a/configs/bf527-sdp_defconfig b/configs/bf527-sdp_defconfig
> index fec1307..0c5c4fd 100644
> --- a/configs/bf527-sdp_defconfig
> +++ b/configs/bf527-sdp_defconfig
> @@ -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
> diff --git a/configs/bf533-ezkit_defconfig b/configs/bf533-ezkit_defconfig
> index 853a5d4..53cd831 100644
> --- a/configs/bf533-ezkit_defconfig
> +++ b/configs/bf533-ezkit_defconfig
> @@ -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
> diff --git a/configs/bf533-stamp_defconfig b/configs/bf533-stamp_defconfig
> index e0f5de9..f31b54b 100644
> --- a/configs/bf533-stamp_defconfig
> +++ b/configs/bf533-stamp_defconfig
> @@ -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
> diff --git a/configs/bf537-pnav_defconfig b/configs/bf537-pnav_defconfig
> index bbc171d..4fd2936 100644
> --- a/configs/bf537-pnav_defconfig
> +++ b/configs/bf537-pnav_defconfig
> @@ -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
> diff --git a/configs/bf537-stamp_defconfig b/configs/bf537-stamp_defconfig
> index d189ad4..b691702 100644
> --- a/configs/bf537-stamp_defconfig
> +++ b/configs/bf537-stamp_defconfig
> @@ -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
> diff --git a/configs/bf538f-ezkit_defconfig b/configs/bf538f-ezkit_defconfig
> index 8507b40..4e835cc 100644
> --- a/configs/bf538f-ezkit_defconfig
> +++ b/configs/bf538f-ezkit_defconfig
> @@ -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
> diff --git a/configs/bf548-ezkit_defconfig b/configs/bf548-ezkit_defconfig
> index 8514d85..19ac4e9 100644
> --- a/configs/bf548-ezkit_defconfig
> +++ b/configs/bf548-ezkit_defconfig
> @@ -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
> diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
> index 6428d18..744eb1c 100644
> --- a/configs/bf561-acvilon_defconfig
> +++ b/configs/bf561-acvilon_defconfig
> @@ -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
> diff --git a/configs/bf561-ezkit_defconfig b/configs/bf561-ezkit_defconfig
> index f8206b8..abb612c 100644
> --- a/configs/bf561-ezkit_defconfig
> +++ b/configs/bf561-ezkit_defconfig
> @@ -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
> diff --git a/configs/br4_defconfig b/configs/br4_defconfig
> index db5d915..90ce839 100644
> --- a/configs/br4_defconfig
> +++ b/configs/br4_defconfig
> @@ -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
> diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
> index 3729722..9677e60 100644
> --- a/configs/chromebook_jerry_defconfig
> +++ b/configs/chromebook_jerry_defconfig
> @@ -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
> diff --git a/configs/cm-bf527_defconfig b/configs/cm-bf527_defconfig
> index 773edfb..bc280a4 100644
> --- a/configs/cm-bf527_defconfig
> +++ b/configs/cm-bf527_defconfig
> @@ -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
> diff --git a/configs/cm-bf533_defconfig b/configs/cm-bf533_defconfig
> index 6fa231d..5bc851a 100644
> --- a/configs/cm-bf533_defconfig
> +++ b/configs/cm-bf533_defconfig
> @@ -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
> diff --git a/configs/cm-bf537e_defconfig b/configs/cm-bf537e_defconfig
> index 16f129b..db636e1 100644
> --- a/configs/cm-bf537e_defconfig
> +++ b/configs/cm-bf537e_defconfig
> @@ -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
> diff --git a/configs/cm-bf537u_defconfig b/configs/cm-bf537u_defconfig
> index 68e8659..f4726b0 100644
> --- a/configs/cm-bf537u_defconfig
> +++ b/configs/cm-bf537u_defconfig
> @@ -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
> diff --git a/configs/cm-bf548_defconfig b/configs/cm-bf548_defconfig
> index 0589803..bcf6d8f 100644
> --- a/configs/cm-bf548_defconfig
> +++ b/configs/cm-bf548_defconfig
> @@ -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
> diff --git a/configs/cm-bf561_defconfig b/configs/cm-bf561_defconfig
> index 5a32f56..3acbc53 100644
> --- a/configs/cm-bf561_defconfig
> +++ b/configs/cm-bf561_defconfig
> @@ -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
> diff --git a/configs/cm5200_defconfig b/configs/cm5200_defconfig
> index 8b98484..f8e28d9 100644
> --- a/configs/cm5200_defconfig
> +++ b/configs/cm5200_defconfig
> @@ -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
> diff --git a/configs/espresso7420_defconfig b/configs/espresso7420_defconfig
> index e7163d3..e782710 100644
> --- a/configs/espresso7420_defconfig
> +++ b/configs/espresso7420_defconfig
> @@ -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
> diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
> index c7396a5..7ae03a6 100644
> --- a/configs/evb-rk3288_defconfig
> +++ b/configs/evb-rk3288_defconfig
> @@ -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
> diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
> index a5c089b..5d25ee4 100644
> --- a/configs/fennec-rk3288_defconfig
> +++ b/configs/fennec-rk3288_defconfig
> @@ -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
> diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
> index ba461b9..f640fce 100644
> --- a/configs/firefly-rk3288_defconfig
> +++ b/configs/firefly-rk3288_defconfig
> @@ -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
> diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
> index e7370d3..697a147 100644
> --- a/configs/fo300_defconfig
> +++ b/configs/fo300_defconfig
> @@ -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
> diff --git a/configs/ibf-dsp561_defconfig b/configs/ibf-dsp561_defconfig
> index 036a92f..c598298 100644
> --- a/configs/ibf-dsp561_defconfig
> +++ b/configs/ibf-dsp561_defconfig
> @@ -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
> diff --git a/configs/ip04_defconfig b/configs/ip04_defconfig
> index 277988c..1e05d3e 100644
> --- a/configs/ip04_defconfig
> +++ b/configs/ip04_defconfig
> @@ -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
> diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
> index 8761b60..2df48c2 100644
> --- a/configs/ls1021aqds_ddr4_nor_defconfig
> +++ b/configs/ls1021aqds_ddr4_nor_defconfig
> @@ -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
> diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
> index 5bb475e..7951f65 100644
> --- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
> +++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
> @@ -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
> diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig
> index 628f2d5..e75297e 100644
> --- a/configs/ls1021aqds_nand_defconfig
> +++ b/configs/ls1021aqds_nand_defconfig
> @@ -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
> diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
> index b511eb0..a54cfc6 100644
> --- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
> +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
> index a59d339..84ab1bd 100644
> --- a/configs/ls1021aqds_nor_defconfig
> +++ b/configs/ls1021aqds_nor_defconfig
> @@ -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
> diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
> index c7db8b7..074d18e 100644
> --- a/configs/ls1021aqds_nor_lpuart_defconfig
> +++ b/configs/ls1021aqds_nor_lpuart_defconfig
> @@ -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
> diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig
> index 49c88a6..ad40e12 100644
> --- a/configs/ls1021aqds_qspi_defconfig
> +++ b/configs/ls1021aqds_qspi_defconfig
> @@ -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
> diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig
> index f856ad7..6812bfb 100644
> --- a/configs/ls1021aqds_sdcard_ifc_defconfig
> +++ b/configs/ls1021aqds_sdcard_ifc_defconfig
> @@ -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
> diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig
> index 09df451..e226071 100644
> --- a/configs/ls1021aqds_sdcard_qspi_defconfig
> +++ b/configs/ls1021aqds_sdcard_qspi_defconfig
> @@ -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
> diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
> index 34cbb4d..e5a0eca 100644
> --- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
> +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig
> index 307153f..43ba7fe 100644
> --- a/configs/ls1021atwr_nor_defconfig
> +++ b/configs/ls1021atwr_nor_defconfig
> @@ -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
> diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
> index 2f95780..8cfaeaf 100644
> --- a/configs/ls1021atwr_nor_lpuart_defconfig
> +++ b/configs/ls1021atwr_nor_lpuart_defconfig
> @@ -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
> diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
> index e8ae266..4762425 100644
> --- a/configs/ls1021atwr_qspi_defconfig
> +++ b/configs/ls1021atwr_qspi_defconfig
> @@ -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
> diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
> index fefd174..25760e4 100644
> --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
> +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
> @@ -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
> diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig
> index 68848d8..5f9efdf 100644
> --- a/configs/ls1021atwr_sdcard_ifc_defconfig
> +++ b/configs/ls1021atwr_sdcard_ifc_defconfig
> @@ -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
> diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig
> index 9faba8d..e272ea7 100644
> --- a/configs/ls1021atwr_sdcard_qspi_defconfig
> +++ b/configs/ls1021atwr_sdcard_qspi_defconfig
> @@ -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
> diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig
> index 6354d1a..557fdfc 100644
> --- a/configs/miniarm-rk3288_defconfig
> +++ b/configs/miniarm-rk3288_defconfig
> @@ -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
> diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
> index 8164484..eabf22a 100644
> --- a/configs/odroid-xu3_defconfig
> +++ b/configs/odroid-xu3_defconfig
> @@ -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
> diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig
> index f3de685..42f532b 100644
> --- a/configs/pdm360ng_defconfig
> +++ b/configs/pdm360ng_defconfig
> @@ -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
> diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
> index 9472bb0..e5f34a1 100644
> --- a/configs/peach-pi_defconfig
> +++ b/configs/peach-pi_defconfig
> @@ -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 # "
> diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
> index d208d68..ddcb451 100644
> --- a/configs/peach-pit_defconfig
> +++ b/configs/peach-pit_defconfig
> @@ -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 # "
> diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
> index 112e6ae..d7f60a1 100644
> --- a/configs/popmetal-rk3288_defconfig
> +++ b/configs/popmetal-rk3288_defconfig
> @@ -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
> diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
> index e7cf5e8..a26ba61 100644
> --- a/configs/pr1_defconfig
> +++ b/configs/pr1_defconfig
> @@ -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
> diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
> index fc9ff78..5ba7769 100644
> --- a/configs/rock2_defconfig
> +++ b/configs/rock2_defconfig
> @@ -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
> diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
> index fc9b4ac..143dd09 100644
> --- a/configs/sandbox_defconfig
> +++ b/configs/sandbox_defconfig
> @@ -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
> diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
> index 85610ed..9ad5274 100644
> --- a/configs/sandbox_noblk_defconfig
> +++ b/configs/sandbox_noblk_defconfig
> @@ -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
> diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
> index ebaf768..cd6f694 100644
> --- a/configs/sandbox_spl_defconfig
> +++ b/configs/sandbox_spl_defconfig
> @@ -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
> diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
> index 6e335f0..de62cb3 100644
> --- a/configs/smdk5250_defconfig
> +++ b/configs/smdk5250_defconfig
> @@ -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 # "
> diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
> index c1d8c45..04521f2 100644
> --- a/configs/smdk5420_defconfig
> +++ b/configs/smdk5420_defconfig
> @@ -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 # "
> diff --git a/configs/snow_defconfig b/configs/snow_defconfig
> index 3d8c8ea..a5754f8 100644
> --- a/configs/snow_defconfig
> +++ b/configs/snow_defconfig
> @@ -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 # "
> diff --git a/configs/spring_defconfig b/configs/spring_defconfig
> index 74287ea..0c394c8 100644
> --- a/configs/spring_defconfig
> +++ b/configs/spring_defconfig
> @@ -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 # "
> diff --git a/configs/tcm-bf518_defconfig b/configs/tcm-bf518_defconfig
> index fd31cfc..9288e56 100644
> --- a/configs/tcm-bf518_defconfig
> +++ b/configs/tcm-bf518_defconfig
> @@ -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
> diff --git a/configs/tcm-bf537_defconfig b/configs/tcm-bf537_defconfig
> index d66e499..8459390 100644
> --- a/configs/tcm-bf537_defconfig
> +++ b/configs/tcm-bf537_defconfig
> @@ -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
> diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
> index 281eabb..5bf0c9a 100644
> --- a/configs/tricorder_defconfig
> +++ b/configs/tricorder_defconfig
> @@ -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 # "
> diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig
> index 7bdf5f5..68d8fb6 100644
> --- a/configs/tricorder_flash_defconfig
> +++ b/configs/tricorder_flash_defconfig
> @@ -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
> diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
> index f7f0acb..eb3cfc0 100644
> --- a/include/configs/T102xQDS.h
> +++ b/include/configs/T102xQDS.h
> @@ -34,7 +34,6 @@
>
> #define CONFIG_DEEP_SLEEP
> #if defined(CONFIG_DEEP_SLEEP)
> -#define CONFIG_SILENT_CONSOLE
> #define CONFIG_BOARD_EARLY_INIT_F
> #endif
>
> diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
> index e61c80d..0d6051e 100644
> --- a/include/configs/T102xRDB.h
> +++ b/include/configs/T102xRDB.h
> @@ -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
>
> diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
> index 9488db2..d64611a 100644
> --- a/include/configs/T1040QDS.h
> +++ b/include/configs/T1040QDS.h
> @@ -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
>
> diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
> index 02633b6..e115bdd 100644
> --- a/include/configs/T104xRDB.h
> +++ b/include/configs/T104xRDB.h
> @@ -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
> diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
> index 14e06fb..814b879 100644
> --- a/include/configs/TQM5200.h
> +++ b/include/configs/TQM5200.h
> @@ -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
> diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
> index 57748b4..051d44e 100644
> --- a/include/configs/UCP1020.h
> +++ b/include/configs/UCP1020.h
> @@ -54,10 +54,6 @@
>
> #define CONFIG_LAST_STAGE_INIT
>
> -#if !defined(CONFIG_DONGLE)
> -#define CONFIG_SILENT_CONSOLE
> -#endif
> -
> #endif
>
> #if defined(CONFIG_TARGET_UCP1020)
> diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
> index bdc81ff..96c6826 100644
> --- a/include/configs/a4m072.h
> +++ b/include/configs/a4m072.h
> @@ -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 */
>
> /*
> diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
> index 502ddad..c401b73 100644
> --- a/include/configs/bfin_adi_common.h
> +++ b/include/configs/bfin_adi_common.h
> @@ -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
> diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
> index 065e700..93ba952 100644
> --- a/include/configs/cm5200.h
> +++ b/include/configs/cm5200.h
> @@ -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
> diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
> index 51a0d19..111b23d 100644
> --- a/include/configs/exynos5-common.h
> +++ b/include/configs/exynos5-common.h
> @@ -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
>
> diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
> index 9e03962..907b5ea 100644
> --- a/include/configs/exynos7420-common.h
> +++ b/include/configs/exynos7420-common.h
> @@ -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
>
> diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
> index 0d72e69..a29073c 100644
> --- a/include/configs/ls1021aqds.h
> +++ b/include/configs/ls1021aqds.h
> @@ -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
> diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
> index e5ac50e..d3ef614 100644
> --- a/include/configs/ls1021atwr.h
> +++ b/include/configs/ls1021atwr.h
> @@ -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
> diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
> index 6d03d69..e0b4d36 100644
> --- a/include/configs/pdm360ng.h
> +++ b/include/configs/pdm360ng.h
> @@ -37,7 +37,6 @@
>
> /* Used for silent command in environment */
> #define CONFIG_SYS_DEVICE_NULLDEV
> -#define CONFIG_SILENT_CONSOLE
>
> /* Video */
> #define CONFIG_VIDEO
> diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
> index e8bf987..7ac3a5e 100644
> --- a/include/configs/rk3288_common.h
> +++ b/include/configs/rk3288_common.h
> @@ -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
> diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
> index 94e024b..bd005fc 100644
> --- a/include/configs/sandbox.h
> +++ b/include/configs/sandbox.h
> @@ -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)
> diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
> index c1c9495..2ae108b 100644
> --- a/include/configs/tricorder.h
> +++ b/include/configs/tricorder.h
> @@ -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)
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index efa95f0..9e2f00d 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -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
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER " Simon Glass
@ 2016-09-30 4:43 ` Heiko Schocher
2016-09-30 6:00 ` Siarhei Siamashka
1 sibling, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 4:43 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> Move these option to Kconfig and tidy up existing uses.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> 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(-)
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
>
> diff --git a/README b/README
> index 0a1f3fe..8f93dad 100644
> --- a/README
> +++ b/README
> @@ -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;
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index b139d1c..c0ffeb3 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -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
>
> diff --git a/common/Kconfig b/common/Kconfig
> index bbd5633..6ee67ac 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -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
> diff --git a/common/console.c b/common/console.c
> index 12293f3..31a9b3e 100644
> --- a/common/console.c
> +++ b/common/console.c
> @@ -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)
> diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
> index fbff9fe..0871408 100644
> --- a/configs/tbs2910_defconfig
> +++ b/configs/tbs2910_defconfig
> @@ -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
> diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
> index dc4cbdb..e02863d 100644
> --- a/include/asm-generic/global_data.h
> +++ b/include/asm-generic/global_data.h
> @@ -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 */
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index d261fb3..c604ce2 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -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.
> diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
> index 85501bc..ddd53dd 100644
> --- a/include/configs/tbs2910.h
> +++ b/include/configs/tbs2910.h
> @@ -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
>
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 9e2f00d..7a69be5 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -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
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 05/29] config: Drop CONFIG_CONSOLE
2016-09-29 20:23 ` [U-Boot] [PATCH v3 05/29] config: Drop CONFIG_CONSOLE Simon Glass
@ 2016-09-30 4:44 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 4:44 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This is not really a config. Rename it to avoid confusion.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> 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
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
>
> diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
> index 177718e..0fbc1fd 100644
> --- a/include/configs/MPC8349ITX.h
> +++ b/include/configs/MPC8349ITX.h
> @@ -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; " \
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 5e2f8ce..d66282a 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -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
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 06/29] config: Drop CONFIG_CONSOLE_DEV
2016-09-29 20:23 ` [U-Boot] [PATCH v3 06/29] config: Drop CONFIG_CONSOLE_DEV Simon Glass
@ 2016-09-30 4:46 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 4:46 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This is not really a config. Rename it to avoid confusion.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> 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(-)
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
>
> diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
> index 22410ce..4f07f23 100644
> --- a/include/configs/advantech_dms-ba16.h
> +++ b/include/configs/advantech_dms-ba16.h
> @@ -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" \
> diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
> index a0e9076..3401f66 100644
> --- a/include/configs/aristainetos-common.h
> +++ b/include/configs/aristainetos-common.h
> @@ -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" \
> diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
> index be93deb..1799cc1 100644
> --- a/include/configs/aristainetos.h
> +++ b/include/configs/aristainetos.h
> @@ -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
>
> diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
> index 152f5e9..8fa3eb5 100644
> --- a/include/configs/aristainetos2.h
> +++ b/include/configs/aristainetos2.h
> @@ -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
> diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h
> index 78791db..df9b5c9 100644
> --- a/include/configs/aristainetos2b.h
> +++ b/include/configs/aristainetos2b.h
> @@ -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
> diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
> index 6c3d98b..8090200 100644
> --- a/include/configs/cgtqmx6eval.h
> +++ b/include/configs/cgtqmx6eval.h
> @@ -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" \
> diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
> index 81b79b2..7e9bcb1 100644
> --- a/include/configs/el6x_common.h
> +++ b/include/configs/el6x_common.h
> @@ -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" \
> diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
> index 87f16d9..6266d95 100644
> --- a/include/configs/embestmx6boards.h
> +++ b/include/configs/embestmx6boards.h
> @@ -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)
> diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
> index 435b0ca..cf805b3 100644
> --- a/include/configs/ge_bx50v3.h
> +++ b/include/configs/ge_bx50v3.h
> @@ -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" \
> diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
> index d48fcc2..6e4a4f8 100644
> --- a/include/configs/mx6cuboxi.h
> +++ b/include/configs/mx6cuboxi.h
> @@ -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=" \
> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
> index 9cf3c2c..f849f34 100644
> --- a/include/configs/mx6qsabreauto.h
> +++ b/include/configs/mx6qsabreauto.h
> @@ -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 */
> diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
> index 3276940..32ebb51 100644
> --- a/include/configs/mx6sabre_common.h
> +++ b/include/configs/mx6sabre_common.h
> @@ -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" \
> diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
> index 5c2734d..789c407 100644
> --- a/include/configs/mx6sabresd.h
> +++ b/include/configs/mx6sabresd.h
> @@ -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 */
> diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
> index 8913784..e9cf190 100644
> --- a/include/configs/o2dnt-common.h
> +++ b/include/configs/o2dnt-common.h
> @@ -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" \
> diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
> index c36245b..2869c4e 100644
> --- a/include/configs/pcm058.h
> +++ b/include/configs/pcm058.h
> @@ -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)
>
> diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
> index 029eddd..983153f 100644
> --- a/include/configs/tqma6.h
> +++ b/include/configs/tqma6.h
> @@ -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" \
> diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
> index 2f52598..3cae4fe 100644
> --- a/include/configs/tqma6_mba6.h
> +++ b/include/configs/tqma6_mba6.h
> @@ -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 */
> diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
> index 8896bc3..3e88391 100644
> --- a/include/configs/tqma6_wru4.h
> +++ b/include/configs/tqma6_wru4.h
> @@ -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
>
> diff --git a/include/configs/zc5202.h b/include/configs/zc5202.h
> index 073a42c..8e75c40 100644
> --- a/include/configs/zc5202.h
> +++ b/include/configs/zc5202.h
> @@ -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"
> diff --git a/include/configs/zc5601.h b/include/configs/zc5601.h
> index 28b9c6b..6ede668 100644
> --- a/include/configs/zc5601.h
> +++ b/include/configs/zc5601.h
> @@ -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"
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index d66282a..56a8354 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -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
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 07/29] Convert CONFIG_VIDEO to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 07/29] Convert CONFIG_VIDEO to Kconfig Simon Glass
@ 2016-09-30 4:47 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 4:47 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_VIDEO
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 08/29] Convert CONFIG_CFB_CONSOLE to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 08/29] Convert CONFIG_CFB_CONSOLE " Simon Glass
@ 2016-09-30 4:48 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
1 sibling, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 4:48 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_CFB_CONSOLE
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v3:
> - Change CONFIG_CFB_CONSOLE to default y if CONFIG_VIDEO
>
> Changes in v2: None
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 09/29] Convert CONFIG_CFB_CONSOLE_ANSI to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 09/29] Convert CONFIG_CFB_CONSOLE_ANSI " Simon Glass
@ 2016-09-30 4:50 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 4:50 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_CFB_CONSOLE_ANSI
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 10/29] Convert CONFIG_VIDEO_CT69000 to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 10/29] Convert CONFIG_VIDEO_CT69000 " Simon Glass
@ 2016-09-30 5:03 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:03 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_VIDEO_CT69000
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> README | 23 -----------------------
> configs/MIP405T_defconfig | 1 +
> configs/MIP405_defconfig | 1 +
> configs/PIP405_defconfig | 1 +
> drivers/video/Kconfig | 27 +++++++++++++++++++++++++++
> include/configs/MIP405.h | 1 -
> include/configs/PIP405.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 8 files changed, 30 insertions(+), 26 deletions(-)
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 11/29] Convert CONFIG_SYS_CONSOLE_BG_COL et al to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 11/29] Convert CONFIG_SYS_CONSOLE_BG_COL et al " Simon Glass
@ 2016-09-30 5:04 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:04 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_SYS_CONSOLE_BG_COL
> CONFIG_SYS_CONSOLE_FG_COL
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> README | 5 ---
> configs/pxm2_defconfig | 2 +
> configs/rut_defconfig | 2 +
> drivers/video/Kconfig | 22 ++++++++++
> drivers/video/cfb_console.c | 98 ++++++++++++++++++++++----------------------
> drivers/video/ct69000.c | 3 +-
> include/configs/pxm2.h | 2 -
> include/configs/rut.h | 2 -
> include/video_fb.h | 8 ----
> scripts/config_whitelist.txt | 2 -
> 10 files changed, 78 insertions(+), 68 deletions(-)
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 12/29] video: Drop the smiLynxEM driver
2016-09-29 20:23 ` [U-Boot] [PATCH v3 12/29] video: Drop the smiLynxEM driver Simon Glass
@ 2016-09-30 5:05 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:05 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This is not used in U-Boot anymore.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> README | 6 -
> drivers/video/Makefile | 1 -
> drivers/video/cfb_console.c | 13 -
> drivers/video/smiLynxEM.c | 835 -------------------------------------------
> scripts/config_whitelist.txt | 1 -
> 5 files changed, 856 deletions(-)
> delete mode 100644 drivers/video/smiLynxEM.c
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 13/29] video: Drop the imx25lcdc driver
2016-09-29 20:23 ` [U-Boot] [PATCH v3 13/29] video: Drop the imx25lcdc driver Simon Glass
@ 2016-09-30 5:05 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:05 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This is not used anywhere in U-Boot.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> drivers/video/Makefile | 1 -
> drivers/video/imx25lcdc.c | 121 ----------------------------------------------
> 2 files changed, 122 deletions(-)
> delete mode 100644 drivers/video/imx25lcdc.c
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 14/29] video: Drop the s3c-fb driver
2016-09-29 20:23 ` [U-Boot] [PATCH v3 14/29] video: Drop the s3c-fb driver Simon Glass
@ 2016-09-30 5:06 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:06 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This is not used in U-Boot.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Acked-by: Minkyu Kang <mk7.kang@samsung.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> drivers/video/Makefile | 1 -
> drivers/video/cfb_console.c | 2 +-
> drivers/video/s3c-fb.c | 172 --------------------------------------------
> 3 files changed, 1 insertion(+), 174 deletions(-)
> delete mode 100644 drivers/video/s3c-fb.c
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 15/29] video: Drop the sed13806 driver
2016-09-29 20:23 ` [U-Boot] [PATCH v3 15/29] video: Drop the sed13806 driver Simon Glass
@ 2016-09-30 5:06 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:06 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This is not used in U-Boot.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> README | 5 -
> drivers/video/Makefile | 1 -
> drivers/video/cfb_console.c | 9 --
> drivers/video/sed13806.c | 286 -------------------------------------------
> include/sed13806.h | 81 ------------
> scripts/config_whitelist.txt | 1 -
> 6 files changed, 383 deletions(-)
> delete mode 100644 drivers/video/sed13806.c
> delete mode 100644 include/sed13806.h
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig Simon Glass
@ 2016-09-30 5:07 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
1 sibling, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:07 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_VGA_AS_SINGLE_DEVICE
>
> Once we migrate to driver model for video, we should be able to drop this
> option.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v3: None
> Changes in v2: None
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 17/29] video: Drop CONFIG_VIDEO_HW_CURSOR
2016-09-29 20:23 ` [U-Boot] [PATCH v3 17/29] video: Drop CONFIG_VIDEO_HW_CURSOR Simon Glass
@ 2016-09-30 5:08 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:08 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This is not used in U-Boot.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 18/29] Convert CONFIG_VIDEO_SW_CURSOR to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 18/29] Convert CONFIG_VIDEO_SW_CURSOR to Kconfig Simon Glass
@ 2016-09-30 5:11 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:11 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_VIDEO_SW_CURSOR
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 20/29] Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 20/29] Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig Simon Glass
@ 2016-09-30 5:15 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:15 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_CONSOLE_EXTRA_INFO
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> configs/MIP405T_defconfig | 1 +
> configs/MIP405_defconfig | 1 +
> configs/MiniFAP_defconfig | 1 +
> configs/PIP405_defconfig | 1 +
> configs/TQM5200_B_HIGHBOOT_defconfig | 1 +
> configs/TQM5200_B_defconfig | 1 +
> configs/TQM5200_STK100_defconfig | 1 +
> configs/TQM5200_defconfig | 1 +
> configs/charon_defconfig | 1 +
> configs/icon_defconfig | 1 +
> configs/ipek01_defconfig | 1 +
> configs/lwmon5_defconfig | 1 +
> configs/socrates_defconfig | 1 +
> drivers/video/Kconfig | 10 ++++++++++
> include/configs/MIP405.h | 1 -
> include/configs/PIP405.h | 1 -
> include/configs/TQM5200.h | 1 -
> include/configs/icon.h | 1 -
> include/configs/ipek01.h | 1 -
> include/configs/lwmon5.h | 1 -
> include/configs/socrates.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 22 files changed, 23 insertions(+), 8 deletions(-)
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 21/29] video: Move video_get_info_str() prototype to a header file
2016-09-29 20:23 ` [U-Boot] [PATCH v3 21/29] video: Move video_get_info_str() prototype to a header file Simon Glass
@ 2016-09-30 5:19 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:19 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This should be defined in a header file so that arguments are checked.
> Move it to video.h.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> board/liebherr/lwmon5/lwmon5.c | 1 +
> board/mosaixtech/icon/icon.c | 1 +
> board/mpl/common/common_util.c | 1 +
> board/tqc/tqm5200/tqm5200.c | 1 +
> drivers/video/cfb_console.c | 25 ++++++++-----------------
> include/video.h | 11 +++++++++++
> 6 files changed, 23 insertions(+), 17 deletions(-)
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 22/29] video: Drop CONFIG_CONSOLE_INFO_QUIET
2016-09-29 20:23 ` [U-Boot] [PATCH v3 22/29] video: Drop CONFIG_CONSOLE_INFO_QUIET Simon Glass
@ 2016-09-30 5:20 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:20 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This is not used in U-Boot. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> include/configs/edminiv2.h | 1 -
> include/configs/km/km_arm.h | 1 -
> include/configs/mv-common.h | 1 -
> include/configs/mvebu_db-88f3720.h | 1 -
> include/configs/mvebu_db-88f7040.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 6 files changed, 6 deletions(-)
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 23/29] Convert CONFIG_LCD to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 23/29] Convert CONFIG_LCD to Kconfig Simon Glass
@ 2016-09-30 5:21 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:21 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_LCD
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 26/29] Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 26/29] Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE " Simon Glass
@ 2016-09-30 5:23 ` Heiko Schocher
0 siblings, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:23 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET " Simon Glass
@ 2016-09-30 5:24 ` Heiko Schocher
2016-10-01 2:39 ` Tom Rini
1 sibling, 0 replies; 66+ messages in thread
From: Heiko Schocher @ 2016-09-30 5:24 UTC (permalink / raw)
To: u-boot
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This converts the following to Kconfig:
> CONFIG_SYS_CONSOLE_INFO_QUIET
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v3: None
> Changes in v2:
> - Make CONFIG_SYS_CONSOLE_INFO_QUIET the default if !CONFIG_MUX
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER " Simon Glass
2016-09-30 4:43 ` Heiko Schocher
@ 2016-09-30 6:00 ` Siarhei Siamashka
2016-10-01 2:38 ` Tom Rini
2016-10-01 18:46 ` Simon Glass
1 sibling, 2 replies; 66+ messages in thread
From: Siarhei Siamashka @ 2016-09-30 6:00 UTC (permalink / raw)
To: u-boot
Hello Simon,
On Thu, 29 Sep 2016 14:23:02 -0600
Simon Glass <sjg@chromium.org> wrote:
> Move these option to Kconfig and tidy up existing uses.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> 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.
> 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(-)
>
> diff --git a/README b/README
> index 0a1f3fe..8f93dad 100644
> --- a/README
> +++ b/README
> @@ -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;
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index b139d1c..c0ffeb3 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -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
>
> diff --git a/common/Kconfig b/common/Kconfig
> index bbd5633..6ee67ac 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -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.
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?
> +
> +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.
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.
> endmenu
>
> config SYS_NO_FLASH
> diff --git a/common/console.c b/common/console.c
> index 12293f3..31a9b3e 100644
> --- a/common/console.c
> +++ b/common/console.c
> @@ -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)
> diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
> index fbff9fe..0871408 100644
> --- a/configs/tbs2910_defconfig
> +++ b/configs/tbs2910_defconfig
> @@ -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
> diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
> index dc4cbdb..e02863d 100644
> --- a/include/asm-generic/global_data.h
> +++ b/include/asm-generic/global_data.h
> @@ -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 */
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index d261fb3..c604ce2 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -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.
> diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
> index 85501bc..ddd53dd 100644
> --- a/include/configs/tbs2910.h
> +++ b/include/configs/tbs2910.h
> @@ -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
>
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 9e2f00d..7a69be5 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -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
--
Best regards,
Siarhei Siamashka
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig
2016-09-30 6:00 ` Siarhei Siamashka
@ 2016-10-01 2:38 ` Tom Rini
2016-10-01 18:46 ` Simon Glass
1 sibling, 0 replies; 66+ messages in thread
From: Tom Rini @ 2016-10-01 2:38 UTC (permalink / raw)
To: u-boot
On Fri, Sep 30, 2016 at 09:00:44AM +0300, Siarhei Siamashka wrote:
> Hello Simon,
>
> On Thu, 29 Sep 2016 14:23:02 -0600
> Simon Glass <sjg@chromium.org> wrote:
>
> > Move these option to Kconfig and tidy up existing uses.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> > 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.
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.
> 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.
So maybe we should hide the size option under EXPERT?
--
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>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 04/29] Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 04/29] Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al " Simon Glass
@ 2016-10-01 2:38 ` Tom Rini
0 siblings, 0 replies; 66+ messages in thread
From: Tom Rini @ 2016-10-01 2:38 UTC (permalink / raw)
To: u-boot
On Thu, Sep 29, 2016 at 02:23:03PM -0600, Simon Glass wrote:
> This converts the following to Kconfig:
> CONFIG_SYS_CONSOLE_IS_IN_ENV
> CONFIG_CONSOLE_MUX
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
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>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 28/29] Convert CONFIG_USB_KEYBOARD to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 28/29] Convert CONFIG_USB_KEYBOARD " Simon Glass
@ 2016-10-01 2:38 ` Tom Rini
0 siblings, 0 replies; 66+ messages in thread
From: Tom Rini @ 2016-10-01 2:38 UTC (permalink / raw)
To: u-boot
On Thu, Sep 29, 2016 at 02:23:27PM -0600, Simon Glass wrote:
> This converts the following to Kconfig:
> CONFIG_USB_KEYBOARD
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
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/1d74f97b/attachment.sig>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 29/29] Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 29/29] Convert CONFIG_SYS_STDIO_DEREGISTER " Simon Glass
@ 2016-10-01 2:38 ` Tom Rini
0 siblings, 0 replies; 66+ messages in thread
From: Tom Rini @ 2016-10-01 2:38 UTC (permalink / raw)
To: u-boot
On Thu, Sep 29, 2016 at 02:23:28PM -0600, Simon Glass wrote:
> This converts the following to Kconfig:
> CONFIG_SYS_STDIO_DEREGISTER
>
> This option should never be enabled in SPL, so use
> CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) when checking the option.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
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/0c92a8e5/attachment.sig>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 02/29] Convert SILENT_CONSOLE options to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 02/29] Convert SILENT_CONSOLE options to Kconfig Simon Glass
2016-09-30 4:41 ` Heiko Schocher
@ 2016-10-01 2:38 ` Tom Rini
1 sibling, 0 replies; 66+ messages in thread
From: Tom Rini @ 2016-10-01 2:38 UTC (permalink / raw)
To: u-boot
On Thu, Sep 29, 2016 at 02:23:01PM -0600, Simon Glass wrote:
> 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.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
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>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 08/29] Convert CONFIG_CFB_CONSOLE to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 08/29] Convert CONFIG_CFB_CONSOLE " Simon Glass
2016-09-30 4:48 ` Heiko Schocher
@ 2016-10-01 2:38 ` Tom Rini
1 sibling, 0 replies; 66+ messages in thread
From: Tom Rini @ 2016-10-01 2:38 UTC (permalink / raw)
To: u-boot
On Thu, Sep 29, 2016 at 02:23:07PM -0600, Simon Glass wrote:
> This converts the following to Kconfig:
> CONFIG_CFB_CONSOLE
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
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/d5c2bcc2/attachment.sig>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig Simon Glass
2016-09-30 5:07 ` Heiko Schocher
@ 2016-10-01 2:38 ` Tom Rini
1 sibling, 0 replies; 66+ messages in thread
From: Tom Rini @ 2016-10-01 2:38 UTC (permalink / raw)
To: u-boot
On Thu, Sep 29, 2016 at 02:23:15PM -0600, Simon Glass wrote:
> This converts the following to Kconfig:
> CONFIG_VGA_AS_SINGLE_DEVICE
>
> Once we migrate to driver model for video, we should be able to drop this
> option.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
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/ff2154e2/attachment.sig>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig
2016-09-29 20:23 ` [U-Boot] [PATCH v3 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET " Simon Glass
2016-09-30 5:24 ` Heiko Schocher
@ 2016-10-01 2:39 ` Tom Rini
1 sibling, 0 replies; 66+ messages in thread
From: Tom Rini @ 2016-10-01 2:39 UTC (permalink / raw)
To: u-boot
On Thu, Sep 29, 2016 at 02:23:26PM -0600, Simon Glass wrote:
> This converts the following to Kconfig:
> CONFIG_SYS_CONSOLE_INFO_QUIET
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
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/a6938eef/attachment.sig>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig
2016-09-30 6:00 ` Siarhei Siamashka
2016-10-01 2:38 ` Tom Rini
@ 2016-10-01 18:46 ` Simon Glass
1 sibling, 0 replies; 66+ messages in thread
From: Simon Glass @ 2016-10-01 18:46 UTC (permalink / raw)
To: u-boot
Hi Siarhei,
On 30 September 2016 at 00:00, Siarhei Siamashka
<siarhei.siamashka@gmail.com> wrote:
>
> Hello Simon,
>
> On Thu, 29 Sep 2016 14:23:02 -0600
> Simon Glass <sjg@chromium.org> wrote:
>
> > Move these option to Kconfig and tidy up existing uses.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> > 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.
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.
>
> > 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(-)
> >
> > diff --git a/README b/README
> > index 0a1f3fe..8f93dad 100644
> > --- a/README
> > +++ b/README
> > @@ -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;
> > diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> > index b139d1c..c0ffeb3 100644
> > --- a/board/sunxi/Kconfig
> > +++ b/board/sunxi/Kconfig
> > @@ -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
> >
> > diff --git a/common/Kconfig b/common/Kconfig
> > index bbd5633..6ee67ac 100644
> > --- a/common/Kconfig
> > +++ b/common/Kconfig
> > @@ -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.
>
> 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?
Yes please. I'd like to see this setup moved to board_init.c, with
just a size CONFIG options, not an address.
>
> > +
> > +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.
>
> 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
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
` (28 preceding siblings ...)
2016-09-29 20:23 ` [U-Boot] [PATCH v3 29/29] Convert CONFIG_SYS_STDIO_DEREGISTER " Simon Glass
@ 2016-10-13 14:02 ` Tom Rini
2016-10-13 14:51 ` Simon Glass
29 siblings, 1 reply; 66+ messages in thread
From: Tom Rini @ 2016-10-13 14:02 UTC (permalink / raw)
To: u-boot
On Thu, Sep 29, 2016 at 02:22:59PM -0600, Simon Glass wrote:
> 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
Can you please re-base this on top of tree? The BOARDINFO/CPUINFO
migration made this painful to re-apply, sorry. Thanks!
--
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/20161013/27721edf/attachment.sig>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig
2016-10-13 14:02 ` [U-Boot] [PATCH v3 00/29] Kconfig: Move console options " Tom Rini
@ 2016-10-13 14:51 ` Simon Glass
2016-10-13 15:09 ` Tom Rini
0 siblings, 1 reply; 66+ messages in thread
From: Simon Glass @ 2016-10-13 14:51 UTC (permalink / raw)
To: u-boot
Hi Tom,
On 13 October 2016 at 08:02, Tom Rini <trini@konsulko.com> wrote:
> On Thu, Sep 29, 2016 at 02:22:59PM -0600, Simon Glass wrote:
>
>> 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
>
> Can you please re-base this on top of tree? The BOARDINFO/CPUINFO
> migration made this painful to re-apply, sorry. Thanks!
Yes, will do. I should probably wait until the pending pull requests go in.
Regards,
Simon
^ permalink raw reply [flat|nested] 66+ messages in thread
* [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig
2016-10-13 14:51 ` Simon Glass
@ 2016-10-13 15:09 ` Tom Rini
0 siblings, 0 replies; 66+ messages in thread
From: Tom Rini @ 2016-10-13 15:09 UTC (permalink / raw)
To: u-boot
On Thu, Oct 13, 2016 at 08:51:09AM -0600, Simon Glass wrote:
> Hi Tom,
>
> On 13 October 2016 at 08:02, Tom Rini <trini@konsulko.com> wrote:
> > On Thu, Sep 29, 2016 at 02:22:59PM -0600, Simon Glass wrote:
> >
> >> 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
> >
> > Can you please re-base this on top of tree? The BOARDINFO/CPUINFO
> > migration made this painful to re-apply, sorry. Thanks!
>
> Yes, will do. I should probably wait until the pending pull requests go in.
Yeah, good idea, I see a few more configs/ changes locally.
--
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/20161013/6e371b11/attachment.sig>
^ permalink raw reply [flat|nested] 66+ messages in thread
end of thread, other threads:[~2016-10-13 15:09 UTC | newest]
Thread overview: 66+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-29 20:22 [U-Boot] [PATCH v3 00/29] Kconfig: Move console options to Kconfig Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 01/29] Remove some merge markers Simon Glass
2016-09-30 4:39 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 02/29] Convert SILENT_CONSOLE options to Kconfig Simon Glass
2016-09-30 4:41 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER " Simon Glass
2016-09-30 4:43 ` Heiko Schocher
2016-09-30 6:00 ` Siarhei Siamashka
2016-10-01 2:38 ` Tom Rini
2016-10-01 18:46 ` Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 04/29] Convert CONFIG_SYS_CONSOLE_IS_IN_ENV et al " Simon Glass
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 05/29] config: Drop CONFIG_CONSOLE Simon Glass
2016-09-30 4:44 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 06/29] config: Drop CONFIG_CONSOLE_DEV Simon Glass
2016-09-30 4:46 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 07/29] Convert CONFIG_VIDEO to Kconfig Simon Glass
2016-09-30 4:47 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 08/29] Convert CONFIG_CFB_CONSOLE " Simon Glass
2016-09-30 4:48 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 09/29] Convert CONFIG_CFB_CONSOLE_ANSI " Simon Glass
2016-09-30 4:50 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 10/29] Convert CONFIG_VIDEO_CT69000 " Simon Glass
2016-09-30 5:03 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 11/29] Convert CONFIG_SYS_CONSOLE_BG_COL et al " Simon Glass
2016-09-30 5:04 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 12/29] video: Drop the smiLynxEM driver Simon Glass
2016-09-30 5:05 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 13/29] video: Drop the imx25lcdc driver Simon Glass
2016-09-30 5:05 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 14/29] video: Drop the s3c-fb driver Simon Glass
2016-09-30 5:06 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 15/29] video: Drop the sed13806 driver Simon Glass
2016-09-30 5:06 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig Simon Glass
2016-09-30 5:07 ` Heiko Schocher
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 17/29] video: Drop CONFIG_VIDEO_HW_CURSOR Simon Glass
2016-09-30 5:08 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 18/29] Convert CONFIG_VIDEO_SW_CURSOR to Kconfig Simon Glass
2016-09-30 5:11 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 19/29] video: Drop CONFIG_VIDEO_SW_CURSOR Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 20/29] Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig Simon Glass
2016-09-30 5:15 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 21/29] video: Move video_get_info_str() prototype to a header file Simon Glass
2016-09-30 5:19 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 22/29] video: Drop CONFIG_CONSOLE_INFO_QUIET Simon Glass
2016-09-30 5:20 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 23/29] Convert CONFIG_LCD to Kconfig Simon Glass
2016-09-30 5:21 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 24/29] Convert CONFIG_CONSOLE_SCROLL_LINES " Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 25/29] Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE " Simon Glass
2016-09-29 20:23 ` [U-Boot] [PATCH v3 26/29] Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE " Simon Glass
2016-09-30 5:23 ` Heiko Schocher
2016-09-29 20:23 ` [U-Boot] [PATCH v3 27/29] Convert CONFIG_SYS_CONSOLE_INFO_QUIET " Simon Glass
2016-09-30 5:24 ` Heiko Schocher
2016-10-01 2:39 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 28/29] Convert CONFIG_USB_KEYBOARD " Simon Glass
2016-10-01 2:38 ` Tom Rini
2016-09-29 20:23 ` [U-Boot] [PATCH v3 29/29] Convert CONFIG_SYS_STDIO_DEREGISTER " Simon Glass
2016-10-01 2:38 ` Tom Rini
2016-10-13 14:02 ` [U-Boot] [PATCH v3 00/29] Kconfig: Move console options " Tom Rini
2016-10-13 14:51 ` Simon Glass
2016-10-13 15:09 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.