[ARM] Fix decompressor serial IO to give CRLF not LFCR

As per the corresponding change to the serial drivers, arrange
for ARM decompressors to give CRLF.  Move the common putstr code
into misc.c such that machines only need to supply "putc" and
"flush" functions.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 9 insertions, 12 deletions

diff --git a/include/asm-arm/arch-sa1100/uncompress.h b/include/asm-arm/arch-sa1100/uncompress.h
index 43453501ee66..2601a77a6dda 100644
--- a/include/asm-arm/arch-sa1100/uncompress.h
+++ b/include/asm-arm/arch-sa1100/uncompress.h
@@ -17,7 +17,7 @@
 
 #define UART(x)         (*(volatile unsigned long *)(serial_port + (x)))
 
-static void putstr( const char *s )
+static void putc(int c)
 {
         unsigned long serial_port;
 
@@ -31,19 +31,16 @@ static void putstr( const char *s )
                 return;
         } while (0);
 
-        for (; *s; s++) {
-                /* wait for space in the UART's transmitter */
-                while (!(UART(UTSR1) & UTSR1_TNF));
+        /* wait for space in the UART's transmitter */
+        while (!(UART(UTSR1) & UTSR1_TNF))
+                barrier();
 
-                /* send the character out. */
-                UART(UTDR) = *s;
+        /* send the character out. */
+        UART(UTDR) = c;
+}
 
-                /* if a LF, also do CR... */
-                if (*s == 10) {
-                        while (!(UART(UTSR1) & UTSR1_TNF));
-                        UART(UTDR) = 13;
-                }
-        }
+static inline void flush(void)
+{
 }
 
 /*