[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, 5 insertions, 10 deletions

diff --git a/include/asm-arm/arch-l7200/uncompress.h b/include/asm-arm/arch-l7200/uncompress.h
index 1caa2b560f5..9fcd40aee3e 100644
--- a/include/asm-arm/arch-l7200/uncompress.h
+++ b/include/asm-arm/arch-l7200/uncompress.h
@@ -16,22 +16,17 @@
 #define __raw_writeb(v,p)       (*(volatile unsigned char *)(p) = (v))
 #define __raw_readb(p)          (*(volatile unsigned char *)(p))
 
-static __inline__ void putc(char c)
+static inline void putc(int c)
 {
         while(__raw_readb(IO_UART + 0x18) & 0x20 ||
-                __raw_readb(IO_UART + 0x18) & 0x08);
+              __raw_readb(IO_UART + 0x18) & 0x08)
+                barrier();
+
         __raw_writeb(c, IO_UART + 0x00);
 }
 
-static void putstr(const char *s)
+static inline void flush(void)
 {
-        while (*s) {
-                if (*s == 10) {                 /* If a LF, add CR */
-                        putc(10);
-                        putc(13);
-                }
-                putc(*(s++));
-        }
 }
 
 static __inline__ void arch_decomp_setup(void)