1 files changed, 34 insertions, 1 deletions

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index a5747e58a9dc..5617566477b4 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -21,6 +21,36 @@
 
 #if defined(CONFIG_DEBUG_ICEDCC)
                 @@ debug using ARM EmbeddedICE DCC channel
+
+#if defined(CONFIG_CPU_V6)
+
+                .macro  addruart, rx
+                .endm
+
+                .macro  senduart, rd, rx
+                mcr     p14, 0, \rd, c0, c5, 0
+                .endm
+
+                .macro  busyuart, rd, rx
+1001:
+                mrc     p14, 0, \rx, c0, c1, 0
+                tst     \rx, #0x20000000
+                beq     1001b
+                .endm
+
+                .macro  waituart, rd, rx
+                mov     \rd, #0x2000000
+1001:
+                subs    \rd, \rd, #1
+                bmi     1002f
+                mrc     p14, 0, \rx, c0, c1, 0
+                tst     \rx, #0x20000000
+                bne     1001b
+1002:
+                .endm
+
+#else
+
                 .macro  addruart, rx
                 .endm
 
@@ -46,9 +76,12 @@
                 bne     1001b
 1002:
                 .endm
+
+#endif  /* CONFIG_CPU_V6 */
+
 #else
 #include <asm/arch/debug-macro.S>
-#endif
+#endif  /* CONFIG_DEBUG_ICEDCC */
 
 /*
  * Useful debugging routines