Skip to content

Commit

Permalink
arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC
Browse files Browse the repository at this point in the history
We have the same (empty) macro for all IDEDCC flavours, so consolidate
it to one.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
  • Loading branch information
Jeremy Kerr authored and Nicolas Pitre committed Oct 20, 2010
1 parent d71e3eb commit 1ea6461
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions arch/arm/kernel/debug.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 1ea6461

Please sign in to comment.