Merge branch 'upstream'

1 files changed, 11 insertions, 13 deletions

diff --git a/include/asm-arm/arch-h720x/uncompress.h b/include/asm-arm/arch-h720x/uncompress.h
index 9535764bcc71..18c69e0f3585 100644
--- a/include/asm-arm/arch-h720x/uncompress.h
+++ b/include/asm-arm/arch-h720x/uncompress.h
@@ -12,22 +12,20 @@
 #define LSR     0x14
 #define TEMPTY  0x40
 
-static void putstr(const char *s)
+static inline void putc(int c)
 {
-        char c;
         volatile unsigned char *p = (volatile unsigned char *)(IO_PHYS+0x20000);
 
-        while ( (c = *s++) != '\0') {
-                /* wait until transmit buffer is empty */
-                while((p[LSR] & TEMPTY) == 0x0);
-                /* write next character */
-                *p = c;
-
-                if(c == '\n') {
-                        while((p[LSR] & TEMPTY) == 0x0);
-                        *p = '\r';
-                }
-        }
+        /* wait until transmit buffer is empty */
+        while((p[LSR] & TEMPTY) == 0x0)
+                barrier();
+
+        /* write next character */
+        *p = c;
+}
+
+static inline void flush(void)
+{
 }
 
 /*