diff options
| -rw-r--r-- | arch/arm/kernel/debug.S | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index a38b4879441d..f91395206a4b 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
| @@ -22,11 +22,11 @@ | |||
| 22 | #if defined(CONFIG_DEBUG_ICEDCC) | 22 | #if defined(CONFIG_DEBUG_ICEDCC) |
| 23 | @@ debug using ARM EmbeddedICE DCC channel | 23 | @@ debug using ARM EmbeddedICE DCC channel |
| 24 | 24 | ||
| 25 | #if defined(CONFIG_CPU_V6) | ||
| 26 | |||
| 27 | .macro addruart, rx, tmp | 25 | .macro addruart, rx, tmp |
| 28 | .endm | 26 | .endm |
| 29 | 27 | ||
| 28 | #if defined(CONFIG_CPU_V6) | ||
| 29 | |||
| 30 | .macro senduart, rd, rx | 30 | .macro senduart, rd, rx |
| 31 | mcr p14, 0, \rd, c0, c5, 0 | 31 | mcr p14, 0, \rd, c0, c5, 0 |
| 32 | .endm | 32 | .endm |
| @@ -51,9 +51,6 @@ | |||
| 51 | 51 | ||
| 52 | #elif defined(CONFIG_CPU_V7) | 52 | #elif defined(CONFIG_CPU_V7) |
| 53 | 53 | ||
| 54 | .macro addruart, rx, tmp | ||
| 55 | .endm | ||
| 56 | |||
| 57 | .macro senduart, rd, rx | 54 | .macro senduart, rd, rx |
| 58 | mcr p14, 0, \rd, c0, c5, 0 | 55 | mcr p14, 0, \rd, c0, c5, 0 |
| 59 | .endm | 56 | .endm |
| @@ -71,9 +68,6 @@ wait: mrc p14, 0, pc, c0, c1, 0 | |||
| 71 | 68 | ||
| 72 | #elif defined(CONFIG_CPU_XSCALE) | 69 | #elif defined(CONFIG_CPU_XSCALE) |
| 73 | 70 | ||
| 74 | .macro addruart, rx, tmp | ||
| 75 | .endm | ||
| 76 | |||
| 77 | .macro senduart, rd, rx | 71 | .macro senduart, rd, rx |
| 78 | mcr p14, 0, \rd, c8, c0, 0 | 72 | mcr p14, 0, \rd, c8, c0, 0 |
| 79 | .endm | 73 | .endm |
| @@ -98,9 +92,6 @@ wait: mrc p14, 0, pc, c0, c1, 0 | |||
| 98 | 92 | ||
| 99 | #else | 93 | #else |
| 100 | 94 | ||
| 101 | .macro addruart, rx, tmp | ||
| 102 | .endm | ||
| 103 | |||
| 104 | .macro senduart, rd, rx | 95 | .macro senduart, rd, rx |
| 105 | mcr p14, 0, \rd, c1, c0, 0 | 96 | mcr p14, 0, \rd, c1, c0, 0 |
| 106 | .endm | 97 | .endm |
