From: Simon Glass <sjg@chromium.org>
Date: Mon, 4 Dec 2017 20:48:19 +0000 (-0700)
Subject: Revert "sandbox: Drop special case console code for sandbox"
X-Git-Tag: v2018.01-rc2~53
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=64e9b4f346f113dec984eaab226a44d35e38d7ce;p=oweals%2Fu-boot.git

Revert "sandbox: Drop special case console code for sandbox"

While sandbox works OK without the special-case code, it does result in
console output being stored in the pre-console buffer while sandbox starts
up. If there is a crash or a problem then there is no indication of what
is going on.

For ease of debugging it seems better to revert this change also.

This reverts commit d8c6fb8cedbc35eee27730a7fa544e499b3c81cc.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/console.c b/common/console.c
index d763f2c684..0e0295514b 100644
--- a/common/console.c
+++ b/common/console.c
@@ -489,6 +489,13 @@ static inline void print_pre_console_buffer(int flushpoint) {}
 
 void putc(const char c)
 {
+#ifdef CONFIG_SANDBOX
+	/* sandbox can send characters to stdout before it has a console */
+	if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
+		os_putc(c);
+		return;
+	}
+#endif
 #ifdef CONFIG_DEBUG_UART
 	/* if we don't have a console yet, use the debug UART */
 	if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {