spl: Add a way to declare an SPL image loader

[u-boot] / common / console.c

diff --git a/common/console.c b/common/console.c
index b3f5fdc03a168682bb351734e2b0b897988d64fb..12293f383624947cc716319a862df4340c44b1c2 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -515,8 +515,6 @@ void puts(const char *s)
                        int ch = *s++;
 
                        printch(ch);
-                       if (ch == '\n')
-                               printch('\r');
                }
                return;
        }
@@ -650,6 +648,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 +797,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) */