diff options
Diffstat (limited to 'arch/arm/mach-u300/include/mach/memory.h')
-rw-r--r-- | arch/arm/mach-u300/include/mach/memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h index bf134bcc129..888e2e351ee 100644 --- a/arch/arm/mach-u300/include/mach/memory.h +++ b/arch/arm/mach-u300/include/mach/memory.h | |||
@@ -15,17 +15,17 @@ | |||
15 | 15 | ||
16 | #ifdef CONFIG_MACH_U300_DUAL_RAM | 16 | #ifdef CONFIG_MACH_U300_DUAL_RAM |
17 | 17 | ||
18 | #define PHYS_OFFSET UL(0x48000000) | 18 | #define PLAT_PHYS_OFFSET UL(0x48000000) |
19 | #define BOOT_PARAMS_OFFSET (PHYS_OFFSET + 0x100) | 19 | #define BOOT_PARAMS_OFFSET (PHYS_OFFSET + 0x100) |
20 | 20 | ||
21 | #else | 21 | #else |
22 | 22 | ||
23 | #ifdef CONFIG_MACH_U300_2MB_ALIGNMENT_FIX | 23 | #ifdef CONFIG_MACH_U300_2MB_ALIGNMENT_FIX |
24 | #define PHYS_OFFSET (0x28000000 + \ | 24 | #define PLAT_PHYS_OFFSET (0x28000000 + \ |
25 | (CONFIG_MACH_U300_ACCESS_MEM_SIZE - \ | 25 | (CONFIG_MACH_U300_ACCESS_MEM_SIZE - \ |
26 | (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024) | 26 | (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024) |
27 | #else | 27 | #else |
28 | #define PHYS_OFFSET (0x28000000 + \ | 28 | #define PLAT_PHYS_OFFSET (0x28000000 + \ |
29 | (CONFIG_MACH_U300_ACCESS_MEM_SIZE + \ | 29 | (CONFIG_MACH_U300_ACCESS_MEM_SIZE + \ |
30 | (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024) | 30 | (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024) |
31 | #endif | 31 | #endif |