diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-05-05 21:12:41 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-05-05 21:12:41 +0200 |
| commit | 2be1bab6a7dc1d1c9ee1e3ca53ff9f011136f1fe (patch) | |
| tree | 1ead443be05f9bf7ff950b789fdb0aa45dbb2738 /common/console.c | |
| parent | 2f15278c2eb911c668b4fe562130b78cf554d139 (diff) | |
| parent | 2f550ab976405300f5b07bf2890800840d0aa05f (diff) | |
| download | talos-obmc-uboot-2be1bab6a7dc1d1c9ee1e3ca53ff9f011136f1fe.tar.gz talos-obmc-uboot-2be1bab6a7dc1d1c9ee1e3ca53ff9f011136f1fe.zip | |
Merge with git://www.denx.de/git/u-boot-testing
Diffstat (limited to 'common/console.c')
| -rw-r--r-- | common/console.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/common/console.c b/common/console.c index e9f23bec18..d8a0cb6c7e 100644 --- a/common/console.c +++ b/common/console.c @@ -494,13 +494,7 @@ int console_init_r (void) /* suppress all output if splash screen is enabled and we have a bmp to display */ if (getenv("splashimage") != NULL) - outputdev = search_device (DEV_FLAGS_OUTPUT, "nulldev"); -#endif - -#ifdef CONFIG_SILENT_CONSOLE - /* Suppress all output if "silent" mode requested */ - if (gd->flags & GD_FLG_SILENT) - outputdev = search_device (DEV_FLAGS_OUTPUT, "nulldev"); + gd->flags |= GD_FLG_SILENT; #endif /* Scan devices looking for input and output devices */ |
