Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

video: extend stdout video console work-around for 'vga'

Browse source 
cfb_console driver uses 'vga' console name and we still have board
environments defining this name. Re-use existing DM_VIDEO work-
around for console name to support 'vga' name in stdout environment.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Tested-by: Soeren Moch <smoch@web.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Anatolij Gustschin 2020-05-23 17:11:20 +02:00
parent db755b36d2
commit 22b897a123
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-tegra/Kconfig
View file

@ -58,7 +58,6 @@ config TEGRA_COMMON
select MISC select MISC
select OF_CONTROL select OF_CONTROL
select SPI select SPI
select VIDCONSOLE_AS_LCD if DM_VIDEO
imply CMD_DM imply CMD_DM
imply CRC32_VERIFY imply CRC32_VERIFY

7
common/console.c
View file

@ -713,7 +713,7 @@ struct stdio_dev *search_device(int flags, const char *name)
dev = stdio_get_by_name(name); dev = stdio_get_by_name(name);
#ifdef CONFIG_VIDCONSOLE_AS_LCD #ifdef CONFIG_VIDCONSOLE_AS_LCD
if (!dev && !strcmp(name, "lcd")) if (!dev && !strcmp(name, CONFIG_VIDCONSOLE_AS_LCD))
dev = stdio_get_by_name("vidconsole"); dev = stdio_get_by_name("vidconsole");
#endif #endif
@ -897,8 +897,9 @@ done:
stdio_print_current_devices(); stdio_print_current_devices();
#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ #endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
#ifdef CONFIG_VIDCONSOLE_AS_LCD #ifdef CONFIG_VIDCONSOLE_AS_LCD
if (strstr(stdoutname, "lcd")) if (strstr(stdoutname, CONFIG_VIDCONSOLE_AS_LCD))
printf("Warning: Please change 'lcd' to 'vidconsole' in stdout/stderr environment vars\n"); printf("Warning: Please change '%s' to 'vidconsole' in stdout/stderr environment vars\n",
CONFIG_VIDCONSOLE_AS_LCD);
#endif #endif
#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE

14
drivers/video/Kconfig
View file

@ -177,14 +177,16 @@ config SIMPLE_PANEL
source "drivers/video/fonts/Kconfig" source "drivers/video/fonts/Kconfig"
config VIDCONSOLE_AS_LCD config VIDCONSOLE_AS_LCD
bool "Use 'vidconsole' when 'lcd' is seen in stdout" string "Use 'vidconsole' when string defined here is seen in stdout"
depends on DM_VIDEO depends on DM_VIDEO
default "lcd" if LCD || TEGRA_COMMON
default "vga" if !LCD
help help
This is a work-around for boards which have 'lcd' in their stdout This is a work-around for boards which have 'lcd' or 'vga' in their
environment variable, but have moved to use driver model for video. stdout environment variable, but have moved to use driver model for
In this case the console will no-longer work. While it is possible video. In this case the console will no-longer work. While it is
to update the environment, the breakage may be confusing for users. possible to update the environment, the breakage may be confusing for
This option will be removed around the end of 2016. users. This option will be removed around the end of 2020.
config VIDEO_COREBOOT config VIDEO_COREBOOT
bool "Enable coreboot framebuffer driver support" bool "Enable coreboot framebuffer driver support"