OMAP5: Adding correct Control id code for OMAP5430

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

diff --git a/common/console.c b/common/console.c
index d34a0f4d87d65771192d8bc9493dd9e4c7b267ee..1177f7d396b889effbb9973b77966a013f15ee96 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -212,7 +212,7 @@ int serial_printf(const char *fmt, ...)
        /* For this to work, printbuffer must be larger than
         * anything we ever want to print.
         */
-       i = vsprintf(printbuffer, fmt, args);
+       i = vscnprintf(printbuffer, sizeof(printbuffer), fmt, args);
        va_end(args);
 
        serial_puts(printbuffer);
@@ -281,7 +281,7 @@ int fprintf(int file, const char *fmt, ...)
        /* For this to work, printbuffer must be larger than
         * anything we ever want to print.
         */
-       i = vsprintf(printbuffer, fmt, args);
+       i = vscnprintf(printbuffer, sizeof(printbuffer), fmt, args);
        va_end(args);
 
        /* Send to desired file */
@@ -329,19 +329,14 @@ int tstc(void)
        return serial_tstc();
 }
 
-#if defined(CONFIG_PRE_CONSOLE_BUFFER) || defined(CONFIG_PRE_CONSOLE_PUTC)
+#ifdef CONFIG_PRE_CONSOLE_BUFFER
 #define CIRC_BUF_IDX(idx) ((idx) % (unsigned long)CONFIG_PRE_CON_BUF_SZ)
 
 static void pre_console_putc(const char c)
 {
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
        char *buffer = (char *)CONFIG_PRE_CON_BUF_ADDR;
 
        buffer[CIRC_BUF_IDX(gd->precon_buf_idx++)] = c;
-#endif
-#ifdef CONFIG_PRE_CONSOLE_PUTC
-       board_pre_console_putc(c);
-#endif
 }
 
 static void pre_console_puts(const char *s)
@@ -352,7 +347,6 @@ static void pre_console_puts(const char *s)
 
 static void print_pre_console_buffer(void)
 {
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
        unsigned long i = 0;
        char *buffer = (char *)CONFIG_PRE_CON_BUF_ADDR;
 
@@ -361,9 +355,7 @@ static void print_pre_console_buffer(void)
 
        while (i < gd->precon_buf_idx)
                putc(buffer[CIRC_BUF_IDX(i++)]);
-#endif
 }
-
 #else
 static inline void pre_console_putc(const char c) {}
 static inline void pre_console_puts(const char *s) {}
@@ -434,7 +426,7 @@ int printf(const char *fmt, ...)
        /* For this to work, printbuffer must be larger than
         * anything we ever want to print.
         */
-       i = vsprintf(printbuffer, fmt, args);
+       i = vscnprintf(printbuffer, sizeof(printbuffer), fmt, args);
        va_end(args);
 
        /* Print the string */
@@ -455,7 +447,7 @@ int vprintf(const char *fmt, va_list args)
        /* For this to work, printbuffer must be larger than
         * anything we ever want to print.
         */
-       i = vsprintf(printbuffer, fmt, args);
+       i = vscnprintf(printbuffer, sizeof(printbuffer), fmt, args);
 
        /* Print the string */
        puts(printbuffer);
@@ -522,7 +514,7 @@ inline void dbg(const char *fmt, ...)
        /* For this to work, printbuffer must be larger than
         * anything we ever want to print.
         */
-       i = vsprintf(printbuffer, fmt, args);
+       i = vsnprintf(printbuffer, sizeof(printbuffer), fmt, args);
        va_end(args);
 
        if ((screen + sizeof(screen) - 1 - cursor)