cmd_usb.c: show cmd usage if no args given

[u-boot] / common / console.c

diff --git a/common/console.c b/common/console.c
index 867c12c10231cdfc74a35e69e4718d6b4485ff50..51c6fb6264a1deedbbcc8008f00daf04ff07dbc8 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -534,7 +534,7 @@ int console_init_f(void)
 
 void stdio_print_current_devices(void)
 {
-#ifdef CONFIG_SYS_CONSOLE_INFO_QUIET
+#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET
        /* Print information */
        puts("In:    ");
        if (stdio_devices[stdin] == NULL) {
@@ -659,10 +659,14 @@ int console_init_r(void)
 #ifdef CONFIG_SPLASH_SCREEN
        /*
         * suppress all output if splash screen is enabled and we have
-        * a bmp to display
+        * a bmp to display. We redirect the output from frame buffer
+        * console to serial console in this case or suppress it if
+        * "silent" mode was requested.
         */
-       if (getenv("splashimage") != NULL)
-               gd->flags |= GD_FLG_SILENT;
+       if (getenv("splashimage") != NULL) {
+               if (!(gd->flags & GD_FLG_SILENT))
+                       outputdev = search_device (DEV_FLAGS_OUTPUT, "serial");
+       }
 #endif
 
        /* Scan devices looking for input and output devices */