From f66c9ba6fc463da0cb48637bb96cd7a50daa7d98 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 17 Apr 2005 16:28:31 +0100 Subject: [PATCH] --- yaml --- r: 235 b: refs/heads/master c: cc56449f53ba45646c6f0a2edf77c4acb342caed h: refs/heads/master i: 233: 6762fc8b123c649b91fe4bce1c2311c8062cf6fc 231: fe6c946ade1c78900e702ace474d84251ace2023 v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-ebsa285/debug-macro.S | 7 +++++-- trunk/include/asm-arm/arch-rpc/debug-macro.S | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 30a6c59ef4c6..32c59300f076 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 684f970e2fd2dc0eb8292500903f54f1ebda0e75 +refs/heads/master: cc56449f53ba45646c6f0a2edf77c4acb342caed diff --git a/trunk/include/asm-arm/arch-ebsa285/debug-macro.S b/trunk/include/asm-arm/arch-ebsa285/debug-macro.S index 237853db6e2f..97d15fc629af 100644 --- a/trunk/include/asm-arm/arch-ebsa285/debug-macro.S +++ b/trunk/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/trunk/include/asm-arm/arch-rpc/debug-macro.S b/trunk/include/asm-arm/arch-rpc/debug-macro.S index 0711828164cd..456d3d754c3d 100644 --- a/trunk/include/asm-arm/arch-rpc/debug-macro.S +++ b/trunk/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