diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-05-07 14:10:38 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-05-07 14:10:38 +0200 |
| commit | 6ede0c8b69ad1e6b16463ec75a6dccca152c4b17 (patch) | |
| tree | 978dcbd6189998876bb227ae5bbea03000a2f9c5 /common/console.c | |
| parent | 61ea75aa07838435ec570ac85a2e3fc038844596 (diff) | |
| parent | ac4cd59d59c9bf3f89cb7a344abf8184d678f562 (diff) | |
| download | blackbird-obmc-uboot-6ede0c8b69ad1e6b16463ec75a6dccca152c4b17.tar.gz blackbird-obmc-uboot-6ede0c8b69ad1e6b16463ec75a6dccca152c4b17.zip | |
Merge with git://www.denx.de/git/u-boot.git
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 */ |
