diff options
author | Wolfgang Denk <wd@denx.de> | 2010-03-21 22:45:36 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-03-21 22:45:36 +0100 |
commit | b46b353b901a45ebe860f8bf874ca99f018cd410 (patch) | |
tree | e2d42c0f36b9d7b67c1a17fe97f4734552370a6b /common/console.c | |
parent | 3c950e2ebfde083084cc926b020e3a22a536bf85 (diff) | |
parent | daa989b47297c9f73426783599c286ef3a1f3f49 (diff) | |
download | u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.zip u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.gz u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.bz2 |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'common/console.c')
-rw-r--r-- | common/console.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/common/console.c b/common/console.c index dc0d13b..51c6fb6 100644 --- a/common/console.c +++ b/common/console.c @@ -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 */ |