1 files changed, 7 insertions, 2 deletions

diff --git a/include/asm-arm/arch-orion/debug-macro.S b/include/asm-arm/arch-orion/debug-macro.S
index e2a80641f214..2746220f5d85 100644
--- a/include/asm-arm/arch-orion/debug-macro.S
+++ b/include/asm-arm/arch-orion/debug-macro.S
@@ -8,9 +8,14 @@
  * published by the Free Software Foundation.
 */
 
+#include <asm/arch/orion.h>
+
         .macro  addruart,rx
-        mov   \rx, #0xf1000000
-        orr   \rx, \rx, #0x00012000
+        mrc     p15, 0, \rx, c1, c0
+        tst     \rx, #1                                 @ MMU enabled?
+        ldreq   \rx, =ORION_REGS_PHYS_BASE
+        ldrne   \rx, =ORION_REGS_VIRT_BASE
+        orr     \rx, \rx, #0x00012000
         .endm
 
 #define UART_SHIFT      2