2 files changed, 20 insertions, 1 deletions

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index d356af7cef82..4fddc509e78e 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -27,6 +27,14 @@
                 .macro  writeb, ch, rb
                 mcr     p14, 0, \ch, c0, c5, 0
                 .endm
+#elif defined(CONFIG_CPU_V7)
+                .macro  loadsp, rb
+                .endm
+                .macro  writeb, ch, rb
+wait:           mrc     p14, 0, pc, c0, c1, 0
+                bcs     wait
+                mcr     p14, 0, \ch, c0, c5, 0
+                .endm
 #elif defined(CONFIG_CPU_XSCALE)
                 .macro  loadsp, rb
                 .endm
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 7e0fe4d42c7b..56a0d116d271 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -53,6 +53,18 @@ static void icedcc_putc(int ch)
 
         asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch));
 }
+
+#elif defined(CONFIG_CPU_V7)
+
+static void icedcc_putc(int ch)
+{
+        asm(
+        "wait:  mrc     p14, 0, pc, c0, c1, 0                   \n\
+                bcs     wait                                    \n\
+                mcr     p14, 0, %0, c0, c5, 0                   "
+        : : "r" (ch));
+}
+
 #elif defined(CONFIG_CPU_XSCALE)
 
 static void icedcc_putc(int ch)
@@ -88,7 +100,6 @@ static void icedcc_putc(int ch)
 #endif
 
 #define putc(ch)        icedcc_putc(ch)
-#define flush() do { } while (0)
 #endif
 
 static void putstr(const char *ptr)