am33xx: Update DT files, add am335x_gp_evm_config target

[karo-tx-uboot.git] / common / console.c

diff --git a/common/console.c b/common/console.c
index 898da3935ef21c101b674174f80fb21c622942d0..ace206ca4ff5dd87651c32da857fae762916f41c 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -6,7 +6,9 @@
  */
 
 #include <common.h>
+#include <debug_uart.h>
 #include <stdarg.h>
+#include <iomux.h>
 #include <malloc.h>
 #include <os.h>
 #include <serial.h>
@@ -124,13 +126,13 @@ static int console_setfile(int file, struct stdio_dev * dev)
                 */
                switch (file) {
                case stdin:
-                       gd->jt[XF_getc] = dev->getc;
-                       gd->jt[XF_tstc] = dev->tstc;
+                       gd->jt->getc = getc;
+                       gd->jt->tstc = tstc;
                        break;
                case stdout:
-                       gd->jt[XF_putc] = dev->putc;
-                       gd->jt[XF_puts] = dev->puts;
-                       gd->jt[XF_printf] = printf;
+                       gd->jt->putc  = putc;
+                       gd->jt->puts  = puts;
+                       gd->jt->printf = printf;
                        break;
                }
                break;
@@ -198,6 +200,20 @@ static void console_putc(int file, const char c)
        }
 }
 
+#ifdef CONFIG_PRE_CONSOLE_BUFFER
+static void console_puts_noserial(int file, const char *s)
+{
+       int i;
+       struct stdio_dev *dev;
+
+       for (i = 0; i < cd_count[file]; i++) {
+               dev = console_devices[file][i];
+               if (dev->puts != NULL && strcmp(dev->name, "serial") != 0)
+                       dev->puts(dev, s);
+       }
+}
+#endif
+
 static void console_puts(int file, const char *s)
 {
        int i;
@@ -235,6 +251,14 @@ static inline void console_putc(int file, const char c)
        stdio_devices[file]->putc(stdio_devices[file], c);
 }
 
+#ifdef CONFIG_PRE_CONSOLE_BUFFER
+static inline void console_puts_noserial(int file, const char *s)
+{
+       if (strcmp(stdio_devices[file]->name, "serial") != 0)
+               stdio_devices[file]->puts(stdio_devices[file], s);
+}
+#endif
+
 static inline void console_puts(int file, const char *s)
 {
        stdio_devices[file]->puts(stdio_devices[file], s);
@@ -381,6 +405,9 @@ int tstc(void)
        return serial_tstc();
 }
 
+#define PRE_CONSOLE_FLUSHPOINT1_SERIAL                 0
+#define PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL  1
+
 #ifdef CONFIG_PRE_CONSOLE_BUFFER
 #define CIRC_BUF_IDX(idx) ((idx) % (unsigned long)CONFIG_PRE_CON_BUF_SZ)
 
@@ -397,31 +424,51 @@ static void pre_console_puts(const char *s)
                pre_console_putc(*s++);
 }
 
-static void print_pre_console_buffer(void)
+static void print_pre_console_buffer(int flushpoint)
 {
-       unsigned long i = 0;
-       char *buffer = (char *)CONFIG_PRE_CON_BUF_ADDR;
+       unsigned long in = 0, out = 0;
+       char *buf_in = (char *)CONFIG_PRE_CON_BUF_ADDR;
+       char buf_out[CONFIG_PRE_CON_BUF_SZ + 1];
 
        if (gd->precon_buf_idx > CONFIG_PRE_CON_BUF_SZ)
-               i = gd->precon_buf_idx - CONFIG_PRE_CON_BUF_SZ;
+               in = gd->precon_buf_idx - CONFIG_PRE_CON_BUF_SZ;
+
+       while (in < gd->precon_buf_idx)
+               buf_out[out++] = buf_in[CIRC_BUF_IDX(in++)];
+
+       buf_out[out] = 0;
 
-       while (i < gd->precon_buf_idx)
-               putc(buffer[CIRC_BUF_IDX(i++)]);
+       switch (flushpoint) {
+       case PRE_CONSOLE_FLUSHPOINT1_SERIAL:
+               puts(buf_out);
+               break;
+       case PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL:
+               console_puts_noserial(stdout, buf_out);
+               break;
+       }
 }
 #else
 static inline void pre_console_putc(const char c) {}
 static inline void pre_console_puts(const char *s) {}
-static inline void print_pre_console_buffer(void) {}
+static inline void print_pre_console_buffer(int flushpoint) {}
 #endif
 
 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)) {
+               printch(c);
+               return;
+       }
+#endif
 #ifdef CONFIG_SILENT_CONSOLE
        if (gd->flags & GD_FLG_SILENT)
                return;
@@ -440,6 +487,7 @@ void putc(const char c)
                fputc(stdout, c);
        } else {
                /* Send directly to the handler */
+               pre_console_putc(c);
                serial_putc(c);
        }
 }
@@ -452,7 +500,18 @@ void puts(const char *s)
                return;
        }
 #endif
+#ifdef CONFIG_DEBUG_UART
+       if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
+               while (*s) {
+                       int ch = *s++;
 
+                       printch(ch);
+                       if (ch == '\n')
+                               printch('\r');
+               }
+               return;
+       }
+#endif
 #ifdef CONFIG_SILENT_CONSOLE
        if (gd->flags & GD_FLG_SILENT)
                return;
@@ -471,6 +530,7 @@ void puts(const char *s)
                fputs(stdout, s);
        } else {
                /* Send directly to the handler */
+               pre_console_puts(s);
                serial_puts(s);
        }
 }
@@ -481,11 +541,6 @@ int printf(const char *fmt, ...)
        uint i;
        char printbuffer[CONFIG_SYS_PBSIZE];
 
-#if !defined(CONFIG_SANDBOX) && !defined(CONFIG_PRE_CONSOLE_BUFFER)
-       if (!gd->have_console)
-               return 0;
-#endif
-
        va_start(args, fmt);
 
        /* For this to work, printbuffer must be larger than
@@ -524,6 +579,7 @@ static int ctrlc_disabled = 0;      /* see disable_ctrl() */
 static int ctrlc_was_pressed = 0;
 int ctrlc(void)
 {
+#ifndef CONFIG_SANDBOX
        if (!ctrlc_disabled && gd->have_console) {
                if (tstc()) {
                        switch (getc()) {
@@ -535,6 +591,8 @@ int ctrlc(void)
                        }
                }
        }
+#endif
+
        return 0;
 }
 /* Reads user's confirmation.
@@ -618,7 +676,7 @@ inline void dbg(const char *fmt, ...)
 
 }
 #else
-inline void dbg(const char *fmt, ...)
+static inline void dbg(const char *fmt, ...)
 {
 }
 #endif
@@ -675,7 +733,7 @@ int console_init_f(void)
                gd->flags |= GD_FLG_SILENT;
 #endif
 
-       print_pre_console_buffer();
+       print_pre_console_buffer(PRE_CONSOLE_FLUSHPOINT1_SERIAL);
 
        return 0;
 }
@@ -719,11 +777,11 @@ int console_init_r(void)
 #endif
 
        /* set default handlers at first */
-       gd->jt[XF_getc] = serial_getc;
-       gd->jt[XF_tstc] = serial_tstc;
-       gd->jt[XF_putc] = serial_putc;
-       gd->jt[XF_puts] = serial_puts;
-       gd->jt[XF_printf] = serial_printf;
+       gd->jt->getc  = serial_getc;
+       gd->jt->tstc  = serial_tstc;
+       gd->jt->putc  = serial_putc;
+       gd->jt->puts  = serial_puts;
+       gd->jt->printf = serial_printf;
 
        /* stdin stdout and stderr are in environment */
        /* scan for it */
@@ -790,6 +848,7 @@ done:
        if ((stdio_devices[stdin] == NULL) && (stdio_devices[stdout] == NULL))
                return 0;
 #endif
+       print_pre_console_buffer(PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL);
        return 0;
 }
 
@@ -865,7 +924,7 @@ int console_init_r(void)
        if ((stdio_devices[stdin] == NULL) && (stdio_devices[stdout] == NULL))
                return 0;
 #endif
-
+       print_pre_console_buffer(PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL);
        return 0;
 }