[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, 13 deletions

diff --git a/include/asm-arm/arch-realview/uncompress.h b/include/asm-arm/arch-realview/uncompress.h
index b5e4d360665b..f05631d76743 100644
--- a/include/asm-arm/arch-realview/uncompress.h
+++ b/include/asm-arm/arch-realview/uncompress.h
@@ -27,22 +27,16 @@
 /*
  * This does not append a newline
  */
-static void putstr(const char *s)
+static inline void putc(int c)
 {
-        while (*s) {
-                while (AMBA_UART_FR & (1 << 5))
-                        barrier();
-
-                AMBA_UART_DR = *s;
+        while (AMBA_UART_FR & (1 << 5))
+                barrier();
 
-                if (*s == '\n') {
-                        while (AMBA_UART_FR & (1 << 5))
-                                barrier();
+        AMBA_UART_DR = c;
+}
 
-                        AMBA_UART_DR = '\r';
-                }
-                s++;
-        }
+static inline void flush(void)
+{
         while (AMBA_UART_FR & (1 << 3))
                 barrier();
 }