Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b75c178a authored by Russell King's avatar Russell King
Browse files

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: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f4117ac9

arch/arm/kernel/setup.c

+3 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static struct init_tags { 
	{ tag_size(tag_core), ATAG_CORE },

	{ 1, PAGE_SIZE, 0xff },

	{ tag_size(tag_mem32), ATAG_MEM },

	{ MEM_SIZE, PHYS_OFFSET },

	{ MEM_SIZE },

	{ 0, ATAG_NONE }

};
@@ -839,6 +839,8 @@ void __init setup_arch(char **cmdline_p) 
	struct machine_desc *mdesc;

	char *from = default_command_line;



	init_tags.mem.start = PHYS_OFFSET;



	unwind_init();



	setup_processor();

arch/arm/mach-msm/board-msm7x27.c

+4 −4
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static void __init msm7x2x_map_io(void) 
MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= PLAT_PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,

	.init_machine	= msm7x2x_init,
@@ -142,7 +142,7 @@ MACHINE_END 
MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= PLAT_PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,

	.init_machine	= msm7x2x_init,
@@ -152,7 +152,7 @@ MACHINE_END 
MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= PLAT_PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,

	.init_machine	= msm7x2x_init,
@@ -162,7 +162,7 @@ MACHINE_END 
MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= PLAT_PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,

	.init_machine	= msm7x2x_init,

arch/arm/mach-msm/board-msm7x30.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-msm/board-qsd8x50.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void __init qsd8x50_init(void) 
MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.boot_params = PLAT_PHYS_OFFSET + 0x100,

	.map_io = qsd8x50_map_io,

	.init_irq = qsd8x50_init_irq,

	.init_machine = qsd8x50_init,
@@ -128,7 +128,7 @@ MACHINE_END 
MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.boot_params = PLAT_PHYS_OFFSET + 0x100,

	.map_io = qsd8x50_map_io,

	.init_irq = qsd8x50_init_irq,

	.init_machine = qsd8x50_init,

arch/arm/mach-msm/board-sapphire.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ MACHINE_START(SAPPHIRE, "sapphire") 
/* Maintainer: Brian Swetland <swetland@google.com> */

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params    = PHYS_OFFSET + 0x100,

	.boot_params    = PLAT_PHYS_OFFSET + 0x100,

	.fixup          = sapphire_fixup,

	.map_io         = sapphire_map_io,

	.init_irq       = sapphire_init_irq,