arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC

We have the same (empty) macro for all IDEDCC flavours, so consolidate
it to one.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index a38b4879441d1715b42c4e7994f9f4d8e67b7fe4..f91395206a4b9792ccae43b9ef5ed0c41dc62218 100644 (file)
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -22,11 +22,11 @@
 #if defined(CONFIG_DEBUG_ICEDCC)
                @@ debug using ARM EmbeddedICE DCC channel
 
-#if defined(CONFIG_CPU_V6)
-
                .macro  addruart, rx, tmp
                .endm
 
+#if defined(CONFIG_CPU_V6)
+
                .macro  senduart, rd, rx
                mcr     p14, 0, \rd, c0, c5, 0
                .endm
@@ -51,9 +51,6 @@
 
 #elif defined(CONFIG_CPU_V7)
 
-               .macro  addruart, rx, tmp
-               .endm
-
                .macro  senduart, rd, rx
                mcr     p14, 0, \rd, c0, c5, 0
                .endm
@@ -71,9 +68,6 @@ wait:         mrc     p14, 0, pc, c0, c1, 0
 
 #elif defined(CONFIG_CPU_XSCALE)
 
-               .macro  addruart, rx, tmp
-               .endm
-
                .macro  senduart, rd, rx
                mcr     p14, 0, \rd, c8, c0, 0
                .endm
@@ -98,9 +92,6 @@ wait:         mrc     p14, 0, pc, c0, c1, 0
 
 #else
 
-               .macro  addruart, rx, tmp
-               .endm
-
                .macro  senduart, rd, rx
                mcr     p14, 0, \rd, c1, c0, 0
                .endm