aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jeremy.kerr@canonical.com>2010-07-21 10:40:50 +0200
committerNicolas Pitre <nico@fluxnic.net>2010-10-20 00:27:33 -0400
commit1ea64615601229f0dc16dee91dc5b50216411baa (patch)
treea0284a273832820199a966666007a28f7310280f
parentd71e3eb5894dbb626dc7e28cfd4f33ebee9a739a (diff)
downloadkernel_samsung_aries-1ea64615601229f0dc16dee91dc5b50216411baa.zip
kernel_samsung_aries-1ea64615601229f0dc16dee91dc5b50216411baa.tar.gz
kernel_samsung_aries-1ea64615601229f0dc16dee91dc5b50216411baa.tar.bz2
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>
-rw-r--r--arch/arm/kernel/debug.S13
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index a38b487..f913952 100644
--- 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