linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm / arch-imx / uncompress.h

diff --git a/include/asm-arm/arch-imx/uncompress.h b/include/asm-arm/arch-imx/uncompress.h
index da333f6..096077f 100644 (file)
--- a/include/asm-arm/arch-imx/uncompress.h
+++ b/include/asm-arm/arch-imx/uncompress.h
@@ -39,7 +39,8 @@
  *
  * This does not append a newline
  */
-static void putc(int c)
+static void
+putstr(const char *s)
 {
        unsigned long serial_port;
 
@@ -53,14 +54,20 @@ static void putc(int c)
                return;
        } while(0);
 
-       while (!(UART(USR2) & USR2_TXFE))
-               barrier();
+       while (*s) {
+               while ( !(UART(USR2) & USR2_TXFE) )
+                       barrier();
 
-       UART(TXR) = c;
-}
+               UART(TXR) = *s;
 
-static inline void flush(void)
-{
+               if (*s == '\n') {
+                       while ( !(UART(USR2) & USR2_TXFE) )
+                               barrier();
+
+                       UART(TXR) = '\r';
+               }
+               s++;
+       }
 }
 
 /*