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

diff --git a/include/asm-arm/arch-clps711x/uncompress.h b/include/asm-arm/arch-clps711x/uncompress.h
index 9fc4bcfa1681..07157b7e4b20 100644
--- a/include/asm-arm/arch-clps711x/uncompress.h
+++ b/include/asm-arm/arch-clps711x/uncompress.h
@@ -25,7 +25,6 @@
 #undef CLPS7111_BASE
 #define CLPS7111_BASE CLPS7111_PHYS_BASE
 
-#define barrier()               __asm__ __volatile__("": : :"memory")
 #define __raw_readl(p)          (*(unsigned long *)(p))
 #define __raw_writel(v,p)       (*(unsigned long *)(p) = (v))
 
@@ -40,21 +39,15 @@
 /*
  * This does not append a newline
  */
-static void putstr(const char *s)
+static inline void putc(int c)
 {
-        char c;
-
-        while ((c = *s++) != '\0') {
-                while (clps_readl(SYSFLGx) & SYSFLG_UTXFF)
-                        barrier();
-                clps_writel(c, UARTDRx);
+        while (clps_readl(SYSFLGx) & SYSFLG_UTXFF)
+                barrier();
+        clps_writel(c, UARTDRx);
+}
 
-                if (c == '\n') {
-                        while (clps_readl(SYSFLGx) & SYSFLG_UTXFF)
-                                barrier();
-                        clps_writel('\r', UARTDRx);
-                }
-        }
+static inline void flush(void)
+{
         while (clps_readl(SYSFLGx) & SYSFLG_UBUSY)
                 barrier();
 }