1 files changed, 13 insertions, 15 deletions

diff --git a/arch/arm/include/debug/sirf.S b/arch/arm/include/debug/sirf.S
index 006ec9fb20c6..630f231f2f37 100644
--- a/arch/arm/include/debug/sirf.S
+++ b/arch/arm/include/debug/sirf.S
@@ -6,35 +6,33 @@
  * Licensed under GPLv2 or later.
  */
 
-#if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1)
-#define SIRFSOC_UART1_PA_BASE          0xb0060000
-#else
-#define SIRFSOC_UART1_PA_BASE          0
-#endif
+#define SIRF_LLUART_TXFIFO_STATUS       0x0114
+#define SIRF_LLUART_TXFIFO_DATA 0x0118
 
-#define SIRFSOC_UART1_VA_BASE           0xFEC60000
+#define SIRF_LLUART_TXFIFO_FULL                       (1 << 5)
 
-#define SIRFSOC_UART_TXFIFO_STATUS      0x0114
-#define SIRFSOC_UART_TXFIFO_DATA        0x0118
+#ifdef CONFIG_DEBUG_SIRFATLAS7_UART0
+#define SIRF_LLUART_TXFIFO_EMPTY                        (1 << 8)
+#else
+#define SIRF_LLUART_TXFIFO_EMPTY                        (1 << 6)
+#endif
 
-#define SIRFSOC_UART1_TXFIFO_FULL                       (1 << 5)
-#define SIRFSOC_UART1_TXFIFO_EMPTY                      (1 << 6)
 
         .macro  addruart, rp, rv, tmp
-        ldr     \rp, =SIRFSOC_UART1_PA_BASE             @ physical
-        ldr     \rv, =SIRFSOC_UART1_VA_BASE             @ virtual
+        ldr     \rp, =CONFIG_DEBUG_UART_PHYS            @ physical
+        ldr     \rv, =CONFIG_DEBUG_UART_VIRT            @ virtual
         .endm
 
         .macro  senduart,rd,rx
-        str     \rd, [\rx, #SIRFSOC_UART_TXFIFO_DATA]
+        str     \rd, [\rx, #SIRF_LLUART_TXFIFO_DATA]
         .endm
 
         .macro  busyuart,rd,rx
         .endm
 
         .macro  waituart,rd,rx
-1001:   ldr     \rd, [\rx, #SIRFSOC_UART_TXFIFO_STATUS]
-        tst     \rd, #SIRFSOC_UART1_TXFIFO_EMPTY
+1001:   ldr     \rd, [\rx, #SIRF_LLUART_TXFIFO_STATUS]
+        tst     \rd, #SIRF_LLUART_TXFIFO_EMPTY
         beq     1001b
         .endm