diff options
Diffstat (limited to 'arch/arm/mach-vexpress')
| -rw-r--r-- | arch/arm/mach-vexpress/include/mach/debug-macro.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-vexpress/include/mach/debug-macro.S b/arch/arm/mach-vexpress/include/mach/debug-macro.S index 5167e2aceeba..050d65e02a42 100644 --- a/arch/arm/mach-vexpress/include/mach/debug-macro.S +++ b/arch/arm/mach-vexpress/include/mach/debug-macro.S | |||
| @@ -12,12 +12,10 @@ | |||
| 12 | 12 | ||
| 13 | #define DEBUG_LL_UART_OFFSET 0x00009000 | 13 | #define DEBUG_LL_UART_OFFSET 0x00009000 |
| 14 | 14 | ||
| 15 | .macro addruart,rx,tmp | 15 | .macro addruart,rp,rv |
| 16 | mrc p15, 0, \rx, c1, c0 | 16 | mov \rp, #DEBUG_LL_UART_OFFSET |
| 17 | tst \rx, #1 @ MMU enabled? | 17 | orr \rv, \rp, #0xf8000000 @ virtual base |
| 18 | moveq \rx, #0x10000000 | 18 | orr \rp, \rp, #0x10000000 @ physical base |
| 19 | movne \rx, #0xf8000000 @ virtual base | ||
| 20 | orr \rx, \rx, #DEBUG_LL_UART_OFFSET | ||
| 21 | .endm | 19 | .endm |
| 22 | 20 | ||
| 23 | #include <asm/hardware/debug-pl01x.S> | 21 | #include <asm/hardware/debug-pl01x.S> |