diff options
Diffstat (limited to 'arch/arm/mach-u300/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/debug-macro.S | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-u300/include/mach/debug-macro.S b/arch/arm/mach-u300/include/mach/debug-macro.S index 92c12420256..df715707bea 100644 --- a/arch/arm/mach-u300/include/mach/debug-macro.S +++ b/arch/arm/mach-u300/include/mach/debug-macro.S | |||
| @@ -10,13 +10,12 @@ | |||
| 10 | */ | 10 | */ |
| 11 | #include <mach/hardware.h> | 11 | #include <mach/hardware.h> |
| 12 | 12 | ||
| 13 | .macro addruart, rx, tmp | 13 | .macro addruart, rp, rv |
| 14 | /* If we move the address using MMU, use this. */ | 14 | /* If we move the address using MMU, use this. */ |
| 15 | mrc p15, 0, \rx, c1, c0 | 15 | ldr \rp, = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address |
| 16 | tst \rx, #1 @ MMU enabled? | 16 | ldr \rv, = U300_SLOW_PER_VIRT_BASE @ MMU on, virtual address |
| 17 | ldreq \rx, = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address | 17 | orr \rp, \rp, #0x00003000 |
| 18 | ldrne \rx, = U300_SLOW_PER_VIRT_BASE @ MMU on, virtual address | 18 | orr \rv, \rv, #0x00003000 |
| 19 | orr \rx, \rx, #0x00003000 | ||
| 20 | .endm | 19 | .endm |
| 21 | 20 | ||
| 22 | #include <asm/hardware/debug-pl01x.S> | 21 | #include <asm/hardware/debug-pl01x.S> |