[PATCH] ARM: fix debug macros

Fix debug EBSA285 and RiscPC debugging macros to detect whether the
MMU is enabled.

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

diff --git a/include/asm-arm/arch-ebsa285/debug-macro.S b/include/asm-arm/arch-ebsa285/debug-macro.S
index 237853db6e2f46ccf034909362df7b6255573dc5..97d15fc629af867c389509b71e4da6057a0e9d83 100644 (file)
--- a/include/asm-arm/arch-ebsa285/debug-macro.S
+++ b/include/asm-arm/arch-ebsa285/debug-macro.S
@@ -45,9 +45,12 @@
                .equ    dc21285_low,  ARMCSR_BASE & 0x00ffffff
 
                .macro  addruart,rx
-               mov     \rx, #dc21285_high
+               mrc     p15, 0, \rx, c1, c0
+               tst     \rx, #1                 @ MMU enabled?
+               moveq   \rx, #0x42000000
+               movne   \rx, #dc21285_high
                .if     dc21285_low
-               orr     \rx, \rx, #dc21285_low
+               orrne   \rx, \rx, #dc21285_low
                .endif
                .endm
 

diff --git a/include/asm-arm/arch-rpc/debug-macro.S b/include/asm-arm/arch-rpc/debug-macro.S
index 0711828164cdadd7b78fa0490faee70dbc63a1ce..456d3d754c3d0711208c06a919b94d47becdfd81 100644 (file)
--- a/include/asm-arm/arch-rpc/debug-macro.S
+++ b/include/asm-arm/arch-rpc/debug-macro.S
@@ -12,7 +12,10 @@
 */
 
                .macro  addruart,rx
-               mov     \rx, #0xe0000000
+               mrc     p15, 0, \rx, c1, c0
+               tst     \rx, #1                 @ MMU enabled?
+               moveq   \rx, #0x03000000
+               movne   \rx, #0xe0000000
                orr     \rx, \rx, #0x00010000
                orr     \rx, \rx, #0x00000fe0
                .endm