diff options
Diffstat (limited to 'arch/arm/mach-zynq/include/mach')
-rw-r--r-- | arch/arm/mach-zynq/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-zynq/include/mach/memory.h | 22 |
2 files changed, 1 insertions, 23 deletions
diff --git a/arch/arm/mach-zynq/include/mach/debug-macro.S b/arch/arm/mach-zynq/include/mach/debug-macro.S index 9f664d5eb81..3ab0be1f619 100644 --- a/arch/arm/mach-zynq/include/mach/debug-macro.S +++ b/arch/arm/mach-zynq/include/mach/debug-macro.S | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <mach/zynq_soc.h> | 17 | #include <mach/zynq_soc.h> |
18 | #include <mach/uart.h> | 18 | #include <mach/uart.h> |
19 | 19 | ||
20 | .macro addruart, rp, rv | 20 | .macro addruart, rp, rv, tmp |
21 | ldr \rp, =LL_UART_PADDR @ physical | 21 | ldr \rp, =LL_UART_PADDR @ physical |
22 | ldr \rv, =LL_UART_VADDR @ virtual | 22 | ldr \rv, =LL_UART_VADDR @ virtual |
23 | .endm | 23 | .endm |
diff --git a/arch/arm/mach-zynq/include/mach/memory.h b/arch/arm/mach-zynq/include/mach/memory.h deleted file mode 100644 index 35a92634dcc..00000000000 --- a/arch/arm/mach-zynq/include/mach/memory.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | /* arch/arm/mach-zynq/include/mach/memory.h | ||
2 | * | ||
3 | * Copyright (C) 2011 Xilinx | ||
4 | * | ||
5 | * This software is licensed under the terms of the GNU General Public | ||
6 | * License version 2, as published by the Free Software Foundation, and | ||
7 | * may be copied, distributed, and modified under those terms. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | */ | ||
14 | |||
15 | #ifndef __MACH_MEMORY_H__ | ||
16 | #define __MACH_MEMORY_H__ | ||
17 | |||
18 | #include <asm/sizes.h> | ||
19 | |||
20 | #define PLAT_PHYS_OFFSET UL(0x0) | ||
21 | |||
22 | #endif | ||