diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /arch/arm/kernel/debug-armv.S | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'arch/arm/kernel/debug-armv.S')
| -rw-r--r-- | arch/arm/kernel/debug-armv.S | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/kernel/debug-armv.S b/arch/arm/kernel/debug-armv.S index 5802dac70..ce7f2f94c 100644 --- a/arch/arm/kernel/debug-armv.S +++ b/arch/arm/kernel/debug-armv.S @@ -68,7 +68,10 @@ #ifndef CONFIG_DEBUG_DC21285_PORT /* For NetWinder debugging */ .macro addruart,rx - mov \rx, #0xff000000 + mrc p15, 0, \rx, c1, c0 + tst \rx, #1 @ MMU enabled? + moveq \rx, #0x7c000000 @ physical + movne \rx, #0xff000000 @ virtual orr \rx, \rx, #0x000003f8 .endm @@ -133,7 +136,10 @@ #elif defined(CONFIG_ARCH_SA1100) .macro addruart,rx - mov \rx, #0xf8000000 + mrc p15, 0, \rx, c1, c0 + tst \rx, #1 @ MMU enabled? + moveq \rx, #0x80000000 @ physical base address + movne \rx, #0xf8000000 @ virtual address add \rx, \rx, #0x00050000 @ Ser3 @add \rx, \rx, #0x00010000 @ Ser1 .endm @@ -171,7 +177,7 @@ ENTRY(printhex4) ENTRY(printhex2) mov r1, #2 -printhex: ldr r2, =hexbuf +printhex: adr r2, hexbuf add r3, r2, r1 mov r1, #0 strb r1, [r3] @@ -209,5 +215,4 @@ ENTRY(printch) mov r0, #0 b 1b - .bss hexbuf: .space 16 |