diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-04 14:03:16 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-17 18:27:30 -0500 |
commit | b75c178afaa975896e894bb2b6951dc4cd43c977 (patch) | |
tree | e3011acbb5c185497e9d72d406b69e5cc20debd5 /arch/arm/mach-vexpress/ct-ca9x4.c | |
parent | f4117ac9e237b74afdf5e001d5ea26a4d15e9847 (diff) |
ARM: P2V: avoid initializers and assembly using PHYS_OFFSET
As PHYS_OFFSET will be becoming a variable, we can't have it used in
initializers nor assembly code. Replace those in generic code with
a run-time initialization. Replace those in platform code using the
individual platform specific PLAT_PHYS_OFFSET.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: David Brown <davidb@codeaurora.org>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-vexpress/ct-ca9x4.c')
-rw-r--r-- | arch/arm/mach-vexpress/ct-ca9x4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index e628402b754..e9bccc5230c 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c | |||
@@ -243,7 +243,7 @@ static void __init ct_ca9x4_init(void) | |||
243 | } | 243 | } |
244 | 244 | ||
245 | MACHINE_START(VEXPRESS, "ARM-Versatile Express CA9x4") | 245 | MACHINE_START(VEXPRESS, "ARM-Versatile Express CA9x4") |
246 | .boot_params = PHYS_OFFSET + 0x00000100, | 246 | .boot_params = PLAT_PHYS_OFFSET + 0x00000100, |
247 | .map_io = ct_ca9x4_map_io, | 247 | .map_io = ct_ca9x4_map_io, |
248 | .init_irq = ct_ca9x4_init_irq, | 248 | .init_irq = ct_ca9x4_init_irq, |
249 | #if 0 | 249 | #if 0 |