1 files changed, 31 insertions, 10 deletions

diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 5ab94584baee..0af3772efcb7 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -20,24 +20,45 @@ unsigned int __machine_arch_type;
 
 #include <linux/string.h>
 
-#include <asm/arch/uncompress.h>
-
 #ifdef STANDALONE_DEBUG
 #define putstr printf
-#endif
+#else
+
+static void putstr(const char *ptr);
+
+#include <linux/compiler.h>
+#include <asm/arch/uncompress.h>
 
 #ifdef CONFIG_DEBUG_ICEDCC
-#define putstr icedcc_putstr
-#define putc icedcc_putc
+static void icedcc_putc(int ch)
+{
+        int status, i = 0x4000000;
 
-extern void icedcc_putc(int ch);
+        do {
+                if (--i < 0)
+                        return;
 
-static void
-icedcc_putstr(const char *ptr)
+                asm("mrc p14, 0, %0, c0, c0, 0" : "=r" (status));
+        } while (status & 2);
+
+        asm("mcr p15, 0, %0, c1, c0, 0" : : "r" (ch));
+}
+
+#define putc(ch)        icedcc_putc(ch)
+#define flush() do { } while (0)
+#endif
+
+static void putstr(const char *ptr)
 {
-        for (; *ptr != '\0'; ptr++) {
-                icedcc_putc(*ptr);
+        char c;
+
+        while ((c = *ptr++) != '\0') {
+                if (c == '\n')
+                        putc('\r');
+                putc(c);
         }
+
+        flush();
 }
 
 #endif