ARM: zynq: Fix uart0 early console virtual address

Virtual address have to have the same offset within
a 2MB aligned section of virtual/phycial address space.

Fix uart0 virtual address to be align with physical one.
Also remove UART_SIZE which is completely unused.

Reported-by: Russ Smith <russells@google.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/include/debug/zynq.S b/arch/arm/include/debug/zynq.S
index 0b762fafa7586a092399f8864f1cfdeaf3ff05ce..3edfef7b34aefcdbfd660d796e25ccb72a55e5b0 100644 (file)
--- a/arch/arm/include/debug/zynq.S
+++ b/arch/arm/include/debug/zynq.S
@@ -20,18 +20,18 @@
 #define UART_SR_TXEMPTY                0x00000008      /* TX FIFO empty */
 
 #define UART0_PHYS             0xE0000000
+#define UART0_VIRT             0xF0000000
 #define UART1_PHYS             0xE0001000
-#define UART_SIZE              SZ_4K
-#define UART_VIRT              0xF0001000
+#define UART1_VIRT             0xF0001000
 
 #if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1)
 # define LL_UART_PADDR         UART1_PHYS
+# define LL_UART_VADDR         UART1_VIRT
 #else
 # define LL_UART_PADDR         UART0_PHYS
+# define LL_UART_VADDR         UART0_VIRT
 #endif
 
-#define LL_UART_VADDR          UART_VIRT
-
                .macro  addruart, rp, rv, tmp
                ldr     \rp, =LL_UART_PADDR     @ physical
                ldr     \rv, =LL_UART_VADDR     @ virtual