summaryrefslogtreecommitdiff
path: root/common/console.c
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2007-04-25 14:01:26 (GMT)
committerWolfgang Denk <wd@denx.de>2007-05-05 19:34:19 (GMT)
commit4ec5bd55ed1ffa91a774af298769621f4fbb18c1 (patch)
treede51fd274ad81d8b747759f7f511d26f8115fb8f /common/console.c
parentb7598a43f2b421a713d8135e98a42c37d9eb9df0 (diff)
downloadu-boot-4ec5bd55ed1ffa91a774af298769621f4fbb18c1.tar.xz
[PATCH] simplify silent console
Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Acked-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'common/console.c')
-rw-r--r--common/console.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/common/console.c b/common/console.c
index e9f23be..d8a0cb6 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 */