Explorar o código

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>
Michal Simek %!s(int64=11) %!d(string=hai) anos
pai
achega
90a6695a2a
Modificáronse 1 ficheiros con 4 adicións e 4 borrados
  1. 4 4
      arch/arm/include/debug/zynq.S

+ 4 - 4
arch/arm/include/debug/zynq.S

@@ -20,18 +20,18 @@
 #define UART_SR_TXEMPTY		0x00000008	/* TX FIFO empty */
 #define UART_SR_TXEMPTY		0x00000008	/* TX FIFO empty */
 
 
 #define UART0_PHYS		0xE0000000
 #define UART0_PHYS		0xE0000000
+#define UART0_VIRT		0xF0000000
 #define UART1_PHYS		0xE0001000
 #define UART1_PHYS		0xE0001000
-#define UART_SIZE		SZ_4K
-#define UART_VIRT		0xF0001000
+#define UART1_VIRT		0xF0001000
 
 
 #if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1)
 #if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1)
 # define LL_UART_PADDR		UART1_PHYS
 # define LL_UART_PADDR		UART1_PHYS
+# define LL_UART_VADDR		UART1_VIRT
 #else
 #else
 # define LL_UART_PADDR		UART0_PHYS
 # define LL_UART_PADDR		UART0_PHYS
+# define LL_UART_VADDR		UART0_VIRT
 #endif
 #endif
 
 
-#define LL_UART_VADDR		UART_VIRT
-
 		.macro	addruart, rp, rv, tmp
 		.macro	addruart, rp, rv, tmp
 		ldr	\rp, =LL_UART_PADDR	@ physical
 		ldr	\rp, =LL_UART_PADDR	@ physical
 		ldr	\rv, =LL_UART_VADDR	@ virtual
 		ldr	\rv, =LL_UART_VADDR	@ virtual