From 8cb8143ef7e490c13512cbdf688faf39f5aa4179 Mon Sep 17 00:00:00 2001
From: dzu <dzu>
Date: Fri, 24 Oct 2003 13:14:45 +0000
Subject: * Correct header printing for multi-image files in do_bootm()

* Make CONFIG_SILENT_CONSOLE work with CONFIG_AUTOBOOT_KEYED
---
 common/main.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'common/main.c')

diff --git a/common/main.c b/common/main.c
index 73f8ff9..a0c9fe8 100644
--- a/common/main.c
+++ b/common/main.c
@@ -102,6 +102,18 @@ static __inline__ int abortboot(int bootdelay)
 	u_int presskey_max = 0;
 	u_int i;
 
+#ifdef CONFIG_SILENT_CONSOLE
+	{
+		DECLARE_GLOBAL_DATA_PTR;
+
+		if (gd->flags & GD_FLG_SILENT) {
+			/* Restore serial console */
+			console_assign (stdout, "serial");
+			console_assign (stderr, "serial");
+		}
+	}
+#endif
+
 #  ifdef CONFIG_AUTOBOOT_PROMPT
 	printf (CONFIG_AUTOBOOT_PROMPT, bootdelay);
 #  endif
@@ -180,6 +192,21 @@ static __inline__ int abortboot(int bootdelay)
 		printf("key timeout\n");
 #  endif
 
+#ifdef CONFIG_SILENT_CONSOLE
+	{
+		DECLARE_GLOBAL_DATA_PTR;
+
+		if (abort) {
+			/* permanently enable normal console output */
+			gd->flags &= ~(GD_FLG_SILENT);
+		} else if (gd->flags & GD_FLG_SILENT) {
+			/* Restore silent console */
+			console_assign (stdout, "nulldev");
+			console_assign (stderr, "nulldev");
+		}
+	}
+#endif
+
 	return abort;
 }
 
-- 
cgit v1.1