* Make sure Block Lock Bits get cleared in R360MPI flash driver

[karo-tx-uboot.git] / common / console.c

diff --git a/common/console.c b/common/console.c
index 13ba63b9467545e9d4d53979aa6182f41939c535..86ed5842115177a696340d6b32e907c64cac0e85 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -355,7 +355,7 @@ int console_init_f (void)
        return (0);
 }
 
        return (0);
 }
 

-#ifdef CFG_CONSOLE_IS_IN_ENV
+#if defined(CFG_CONSOLE_IS_IN_ENV) || defined(CONFIG_SPLASH_SCREEN)

 /* search a device */
 device_t *search_device (int flags, char *name)
 {
 /* search a device */
 device_t *search_device (int flags, char *name)
 {


@@ -374,7 +374,7 @@ device_t *search_device (int flags, char *name)
        }
        return dev;
 }
        }
        return dev;
 }

-#endif /* CFG_CONSOLE_IS_IN_ENV */
+#endif /* CFG_CONSOLE_IS_IN_ENV || CONFIG_SPLASH_SCREEN */

 
 #ifdef CFG_CONSOLE_IS_IN_ENV
 /* Called after the relocation - use desired console functions */
 
 #ifdef CFG_CONSOLE_IS_IN_ENV
 /* Called after the relocation - use desired console functions */


@@ -469,6 +469,11 @@ int console_init_r (void)
        device_t *inputdev = NULL, *outputdev = NULL;
        int i, items = ListNumItems (devlist);
 
        device_t *inputdev = NULL, *outputdev = NULL;
        int i, items = ListNumItems (devlist);
 

+#ifdef CONFIG_SPLASH_SCREEN
+       /* suppress all output if splash screen is enabled */
+       outputdev = search_device (DEV_FLAGS_OUTPUT, "nulldev");
+#endif
+

        /* Scan devices looking for input and output devices */
        for (i = 1;
             (i <= items) && ((inputdev == NULL) || (outputdev == NULL));
        /* Scan devices looking for input and output devices */
        for (i = 1;
             (i <= items) && ((inputdev == NULL) || (outputdev == NULL));