diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2016-02-15 04:17:47 -0500 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-02-25 08:06:03 -0500 |
| commit | 8fff2f752f2c9d31414f83170157701b59aec4c1 (patch) | |
| tree | 3af9c13d5a8142814281a1475ce0633b29d96251 | |
| parent | 6ded93a1193071fa56b4ce03f6ef2ccbf42ffee5 (diff) | |
ARM: zynq: Move early printk virtual address to vmalloc area
The patch
"ARM: 8432/1: move VMALLOC_END from 0xff000000 to 0xff800000"
(sha1: 6ff0966052c46efb53980b8a1add2e7b49c9f560)
has moved also start of VMALLOC area because size didn't change.
That's why origin location of vmalloc was
vmalloc : 0xf0000000 - 0xff000000 ( 240 MB)
and now is
vmalloc : 0xf0800000 - 0xff800000 ( 240 MB)
That's why uart virtual addresses need to be changed to reflect this new
memory setup. Starting address should be vmalloc start address.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/include/debug/zynq.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/debug/zynq.S b/arch/arm/include/debug/zynq.S index de86b9247564..060cb5b49bfd 100644 --- a/arch/arm/include/debug/zynq.S +++ b/arch/arm/include/debug/zynq.S | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | #define UART_SR_TXEMPTY 0x00000008 /* TX FIFO empty */ | 20 | #define UART_SR_TXEMPTY 0x00000008 /* TX FIFO empty */ |
| 21 | 21 | ||
| 22 | #define UART0_PHYS 0xE0000000 | 22 | #define UART0_PHYS 0xE0000000 |
| 23 | #define UART0_VIRT 0xF0000000 | 23 | #define UART0_VIRT 0xF0800000 |
| 24 | #define UART1_PHYS 0xE0001000 | 24 | #define UART1_PHYS 0xE0001000 |
| 25 | #define UART1_VIRT 0xF0001000 | 25 | #define UART1_VIRT 0xF0801000 |
| 26 | 26 | ||
| 27 | #if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1) | 27 | #if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1) |
| 28 | # define LL_UART_PADDR UART1_PHYS | 28 | # define LL_UART_PADDR UART1_PHYS |