brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 15:26:03 +09:00
Code Issues Projects Releases Wiki Activity

video: restore CONFIG_VIDCONSOLE_AS_LCD as boolean

Browse Source 
This patch restores CONFIG_VIDCONSOLE_AS_LCD as boolean
and introduce a separate sting as CONFIG_VIDCONSOLE_AS_NAME
to search this string in stdout used as videoconsole.

This patch avoid issue with board defconfig or code expecting
CONFIG_VIDCONSOLE_AS_LCD as boolean.

Fixes: 22b897a123 ("video: extend stdout video console work-around for 'vga'")
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay 2020-07-01 14:56:10 +02:00 committed by Tom Rini
parent 6e7d7aa2e2
commit 27b5b9ec93
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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);
#ifdef CONFIG_VIDCONSOLE_AS_LCD
if (!dev && !strcmp(name, CONFIG_VIDCONSOLE_AS_LCD))
if (!dev && !strcmp(name, CONFIG_VIDCONSOLE_AS_NAME))
dev = stdio_get_by_name("vidconsole");
#endif
@ -897,9 +897,9 @@ done:
stdio_print_current_devices();
#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
#ifdef CONFIG_VIDCONSOLE_AS_LCD
if (strstr(stdoutname, CONFIG_VIDCONSOLE_AS_LCD))
if (strstr(stdoutname, CONFIG_VIDCONSOLE_AS_NAME))
printf("Warning: Please change '%s' to 'vidconsole' in stdout/stderr environment vars\n",
CONFIG_VIDCONSOLE_AS_LCD);
CONFIG_VIDCONSOLE_AS_NAME);
#endif
#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE

12
drivers/video/Kconfig
View File

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