diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-11 18:18:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-11 18:18:15 -0500 |
| commit | 9ef2835f26652092a61b0cb0551ef4f36be27946 (patch) | |
| tree | 6bba2498b2364342cdfc02789efad167b72d4c50 /common | |
| parent | cc8d698fabf072f49ef4dfb2cfdbe0f57d54af81 (diff) | |
| parent | 6c88b51305d69b9728c56f27f363530a7f3d7e83 (diff) | |
| download | talos-obmc-uboot-9ef2835f26652092a61b0cb0551ef4f36be27946.tar.gz talos-obmc-uboot-9ef2835f26652092a61b0cb0551ef4f36be27946.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common')
| -rw-r--r-- | common/console.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/common/console.c b/common/console.c index b3f5fdc03a..6a0d11bb04 100644 --- a/common/console.c +++ b/common/console.c @@ -650,6 +650,10 @@ struct stdio_dev *search_device(int flags, const char *name) struct stdio_dev *dev; dev = stdio_get_by_name(name); +#ifdef CONFIG_VIDCONSOLE_AS_LCD + if (!dev && !strcmp(name, "lcd")) + dev = stdio_get_by_name("vidconsole"); +#endif if (dev && (dev->flags & flags)) return dev; @@ -795,6 +799,10 @@ done: #ifndef CONFIG_SYS_CONSOLE_INFO_QUIET 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"); +#endif #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE /* set the environment variables (will overwrite previous env settings) */ |
