[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, 8 insertions, 12 deletions

diff --git a/include/asm-arm/arch-omap/uncompress.h b/include/asm-arm/arch-omap/uncompress.h
index c718264affb..ca2c8bec82e 100644
--- a/include/asm-arm/arch-omap/uncompress.h
+++ b/include/asm-arm/arch-omap/uncompress.h
@@ -30,8 +30,7 @@ unsigned int system_rev;
 #define check_port(base, shift) ((base[UART_OMAP_MDR1 << shift] & 7) == 0)
 #define omap_get_id() ((*(volatile unsigned int *)(0xfffed404)) >> 12) & ID_MASK
 
-static void
-putstr(const char *s)
+static void putc(int c)
 {
         volatile u8 * uart = 0;
         int shift = 2;
@@ -69,16 +68,13 @@ putstr(const char *s)
         /*
          * Now, xmit each character
          */
-        while (*s) {
-                while (!(uart[UART_LSR << shift] & UART_LSR_THRE))
-                        barrier();
-                uart[UART_TX << shift] = *s;
-                if (*s++ == '\n') {
-                        while (!(uart[UART_LSR << shift] & UART_LSR_THRE))
-                                barrier();
-                        uart[UART_TX << shift] = '\r';
-                }
-        }
+        while (!(uart[UART_LSR << shift] & UART_LSR_THRE))
+                barrier();
+        uart[UART_TX << shift] = c;
+}
+
+static inline void flush(void)
+{
 }
 
 /*