summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordzu <dzu>2003-09-29 21:55:54 +0000
committerdzu <dzu>2003-09-29 21:55:54 +0000
commit87970ebeb5153bb8650d3f031148e82e30ec3584 (patch)
tree8f7458b0f90daa217387c85c970e0606a6117441
parent8a42eac7442816934567215cdc0de4e94df5b6d1 (diff)
Suppress all output with splashscreen configured only if "splashimage"
is set
-rw-r--r--common/console.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/common/console.c b/common/console.c
index d933c33519c..3ef60fd7ac3 100644
--- a/common/console.c
+++ b/common/console.c
@@ -488,8 +488,10 @@ int console_init_r (void)
int i, items = ListNumItems (devlist);
#ifdef CONFIG_SPLASH_SCREEN
- /* suppress all output if splash screen is enabled */
- outputdev = search_device (DEV_FLAGS_OUTPUT, "nulldev");
+ /* 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
/* Scan devices looking for input and output devices */