1 files changed, 8 insertions, 7 deletions

diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S
index 4a63a2ea484d..35b24409a0c8 100644
--- a/arch/arm/mach-omap2/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
@@ -13,6 +13,8 @@
 
 #include <linux/serial_reg.h>
 
+#include <asm/memory.h>
+
 #include <plat/serial.h>
 
 #define UART_OFFSET(addr)       ((addr) & 0x00ffffff)
@@ -40,13 +42,12 @@ omap_uart_lsr:	.word	0
                 cmp     \rx, #0                 @ is port configured?
                 bne     99f                     @ already configured
 
-                /* Check UART1 scratchpad register for uart to use */
+                /* Check the debug UART configuration set in uncompress.h */
                 mrc     p15, 0, \rx, c1, c0
                 tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #0x48000000        @ physical base address
-                movne   \rx, #0xfa000000        @ virtual base
-                orr     \rx, \rx, #0x0006a000   @ uart1 on omap2/3/4
-                ldrb    \rx, [\rx, #(UART_SCR << OMAP_PORT_SHIFT)] @ scratchpad
+                ldreq   \rx, =OMAP_UART_INFO
+                ldrne   \rx, =__phys_to_virt(OMAP_UART_INFO)
+                ldr     \rx, [\rx, #0]
 
                 /* Select the UART to use based on the UART1 scratchpad value */
                 cmp     \rx, #0                 @ no port configured?
@@ -87,10 +88,10 @@ omap_uart_lsr:	.word	0
                 b       98f
 44:             mov     \rx, #UART_OFFSET(OMAP4_UART4_BASE)
                 b       98f
-95:             mov     \rx, #ZOOM_UART_BASE
+95:             ldr     \rx, =ZOOM_UART_BASE
                 ldr     \tmp, =omap_uart_phys
                 str     \rx, [\tmp, #0]
-                mov     \rx, #ZOOM_UART_VIRT
+                ldr     \rx, =ZOOM_UART_VIRT
                 ldr     \tmp, =omap_uart_virt
                 str     \rx, [\tmp, #0]
                 mov     \rx, #(UART_LSR << ZOOM_PORT_SHIFT)