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>
This commit is contained in:
@@ -85,7 +85,7 @@ static void __init msm7x30_map_io(void)
|
||||
MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")
|
||||
#ifdef CONFIG_MSM_DEBUG_UART
|
||||
#endif
|
||||
.boot_params = PHYS_OFFSET + 0x100,
|
||||
.boot_params = PLAT_PHYS_OFFSET + 0x100,
|
||||
.map_io = msm7x30_map_io,
|
||||
.init_irq = msm7x30_init_irq,
|
||||
.init_machine = msm7x30_init,
|
||||
@@ -95,7 +95,7 @@ MACHINE_END
|
||||
MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")
|
||||
#ifdef CONFIG_MSM_DEBUG_UART
|
||||
#endif
|
||||
.boot_params = PHYS_OFFSET + 0x100,
|
||||
.boot_params = PLAT_PHYS_OFFSET + 0x100,
|
||||
.map_io = msm7x30_map_io,
|
||||
.init_irq = msm7x30_init_irq,
|
||||
.init_machine = msm7x30_init,
|
||||
@@ -105,7 +105,7 @@ MACHINE_END
|
||||
MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")
|
||||
#ifdef CONFIG_MSM_DEBUG_UART
|
||||
#endif
|
||||
.boot_params = PHYS_OFFSET + 0x100,
|
||||
.boot_params = PLAT_PHYS_OFFSET + 0x100,
|
||||
.map_io = msm7x30_map_io,
|
||||
.init_irq = msm7x30_init_irq,
|
||||
.init_machine = msm7x30_init,
|
||||
|
Reference in New Issue
Block a user