diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-07-23 15:37:43 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-29 18:08:52 -0400 |
commit | c6f54a9b39626090c934646f7d732e31b70ffce7 (patch) | |
tree | 46a2fb3b19d26780bb7958e053d4d8f00990e8f6 /arch/arm/mach-realview/include/mach | |
parent | 04fcab32d3fa1d3f6afe97e0ab431c5572e07a2c (diff) |
ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>
The platforms selecting NEED_MACH_MEMORY_H defined the start address of
their physical memory in the respective <mach/memory.h>. With
ARM_PATCH_PHYS_VIRT=y (which is quite common today) this is useless
though because the definition isn't used but determined dynamically.
So remove the definitions from all <mach/memory.h> and provide the
Kconfig symbol PHYS_OFFSET with the respective defaults in case
ARM_PATCH_PHYS_VIRT isn't enabled.
This allows to drop the dependency of PHYS_OFFSET on !NEED_MACH_MEMORY_H
which prevents compiling an integrator nommu-kernel.
(CONFIG_PAGE_OFFSET which has "default PHYS_OFFSET if !MMU" expanded to
"0x" because CONFIG_PHYS_OFFSET doesn't exist as INTEGRATOR selects
NEED_MACH_MEMORY_H.)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-realview/include/mach')
-rw-r--r-- | arch/arm/mach-realview/include/mach/memory.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h index db09170e3832..23e7a313f75d 100644 --- a/arch/arm/mach-realview/include/mach/memory.h +++ b/arch/arm/mach-realview/include/mach/memory.h | |||
@@ -20,15 +20,6 @@ | |||
20 | #ifndef __ASM_ARCH_MEMORY_H | 20 | #ifndef __ASM_ARCH_MEMORY_H |
21 | #define __ASM_ARCH_MEMORY_H | 21 | #define __ASM_ARCH_MEMORY_H |
22 | 22 | ||
23 | /* | ||
24 | * Physical DRAM offset. | ||
25 | */ | ||
26 | #ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET | ||
27 | #define PLAT_PHYS_OFFSET UL(0x70000000) | ||
28 | #else | ||
29 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
30 | #endif | ||
31 | |||
32 | #ifdef CONFIG_SPARSEMEM | 23 | #ifdef CONFIG_SPARSEMEM |
33 | 24 | ||
34 | /* | 25 | /* |