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 fc1963b2a978a1be548f07e98108e1b817432e0c..ace206ca4ff5dd87651c32da857fae762916f41c 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <debug_uart.h>
 #include <stdarg.h>
 #include <iomux.h>
 #include <malloc.h>
@@ -125,13 +126,13 @@ static int console_setfile(int file, struct stdio_dev * dev)
                 */
                switch (file) {
                case stdin:
-                       gd->jt[XF_getc] = getc;
-                       gd->jt[XF_tstc] = tstc;
+                       gd->jt->getc = getc;
+                       gd->jt->tstc = tstc;
                        break;
                case stdout:
-                       gd->jt[XF_putc] = putc;
-                       gd->jt[XF_puts] = puts;
-                       gd->jt[XF_printf] = printf;
+                       gd->jt->putc  = putc;
+                       gd->jt->puts  = puts;
+                       gd->jt->printf = printf;
                        break;
                }
                break;
@@ -200,15 +201,15 @@ static void console_putc(int file, const char c)
 }
 
 #ifdef CONFIG_PRE_CONSOLE_BUFFER
-static void console_putc_noserial(int file, const char c)
+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->putc != NULL && strcmp(dev->name, "serial") != 0)
-                       dev->putc(dev, c);
+               if (dev->puts != NULL && strcmp(dev->name, "serial") != 0)
+                       dev->puts(dev, s);
        }
 }
 #endif
@@ -251,10 +252,10 @@ static inline void console_putc(int file, const char c)
 }
 
 #ifdef CONFIG_PRE_CONSOLE_BUFFER
-static inline void console_putc_noserial(int file, const char c)
+static inline void console_puts_noserial(int file, const char *s)
 {
        if (strcmp(stdio_devices[file]->name, "serial") != 0)
-               stdio_devices[file]->putc(stdio_devices[file], c);
+               stdio_devices[file]->puts(stdio_devices[file], s);
 }
 #endif
 
@@ -425,22 +426,26 @@ static void pre_console_puts(const char *s)
 
 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 (i < gd->precon_buf_idx)
-               switch (flushpoint) {
-               case PRE_CONSOLE_FLUSHPOINT1_SERIAL:
-                       putc(buffer[CIRC_BUF_IDX(i++)]);
-                       break;
-               case PRE_CONSOLE_FLUSHPOINT2_EVERYTHING_BUT_SERIAL:
-                       console_putc_noserial(stdout,
-                                             buffer[CIRC_BUF_IDX(i++)]);
-                       break;
-               }
+       while (in < gd->precon_buf_idx)
+               buf_out[out++] = buf_in[CIRC_BUF_IDX(in++)];
+
+       buf_out[out] = 0;
+
+       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) {}
@@ -451,11 +456,19 @@ 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)) {
+               printch(c);
+               return;
+       }
+#endif
 #ifdef CONFIG_SILENT_CONSOLE
        if (gd->flags & GD_FLG_SILENT)
                return;
@@ -487,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;
@@ -517,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
@@ -758,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 */