summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-07-23 06:55:07 -0600
committerSimon Glass <sjg@chromium.org>2014-07-23 14:07:25 +0100
commit093f79ab88d57b800283b0a172c17167699f4243 (patch)
tree8169ae4fb289257468c015f1b72cb989d7b04390 /common
parent7793ac96c6094e0a0291e19a5bcf3000c6388250 (diff)
Add a flag indicating when the serial console is ready
For sandbox we have a fallback console which is used very early in U-Boot, before serial drivers are available. Rather than try to guess when to switch to the real console, add a flag so we can be sure. This makes sure that sandbox can always output a panic() message, for example, and avoids silent failure (which is very annoying in sandbox). Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/console.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/console.c b/common/console.c
index 5576dfd94a..898da3935e 100644
--- a/common/console.c
+++ b/common/console.c
@@ -417,7 +417,7 @@ static inline void print_pre_console_buffer(void) {}
void putc(const char c)
{
#ifdef CONFIG_SANDBOX
- if (!gd) {
+ if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
os_putc(c);
return;
}
@@ -447,7 +447,7 @@ void putc(const char c)
void puts(const char *s)
{
#ifdef CONFIG_SANDBOX
- if (!gd) {
+ if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
os_puts(s);
return;
}