diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-18 16:59:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-18 16:59:16 -0400 |
| commit | 04909251fdecac9d05e527b83e86e043e8df00ea (patch) | |
| tree | 28457d74af51288b0617623d3042693d7696e62b /common | |
| parent | 83fdb4388253240138e2ce364abe6b070b756d87 (diff) | |
| parent | fb3dd9c005045c2748e30d555d252c6985b97349 (diff) | |
| download | u-boot-04909251fdecac9d05e527b83e86e043e8df00ea.zip u-boot-04909251fdecac9d05e527b83e86e043e8df00ea.tar.gz u-boot-04909251fdecac9d05e527b83e86e043e8df00ea.tar.bz2 | |
Merge tag 'video-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-video into next
- migrate remaining imx5/imx6qd boards to DM_VIDEO
- use 'vidconsole' stdout in nitrogen6x upgrade script
- add option for selection of the vidconsole commands
lcdputs and setcurs
- allow building ipuv3 driver with disabled CONFIG_PANEL
- make backlight and panel drivers optional
- remove useless code from ipuv3 driver
- extend existing DM_VIDEO work-around for console name
to support 'vga'
- remove non-DM code in ipuv3
Diffstat (limited to 'common')
| -rw-r--r-- | common/console.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/console.c b/common/console.c index 1deca3c..f149624 100644 --- a/common/console.c +++ b/common/console.c @@ -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, "lcd")) + if (!dev && !strcmp(name, CONFIG_VIDCONSOLE_AS_LCD)) dev = stdio_get_by_name("vidconsole"); #endif @@ -897,8 +897,9 @@ done: stdio_print_current_devices(); #endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ #ifdef CONFIG_VIDCONSOLE_AS_LCD - if (strstr(stdoutname, "lcd")) - printf("Warning: Please change 'lcd' to 'vidconsole' in stdout/stderr environment vars\n"); + if (strstr(stdoutname, CONFIG_VIDCONSOLE_AS_LCD)) + printf("Warning: Please change '%s' to 'vidconsole' in stdout/stderr environment vars\n", + CONFIG_VIDCONSOLE_AS_LCD); #endif #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE |