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

Commit 34101237 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET 



This is a further step in allowing to build a kernel image for more
than one imx SOC.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 7fc06d8c

arch/arm/mach-mx1/mach-mx1ads.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ MACHINE_START(MX1ADS, "Freescale MX1ADS") 
	/* Maintainer: Sascha Hauer, Pengutronix */

	.phys_io	= IMX_IO_PHYS,

	.io_pg_offst	= (IMX_IO_BASE >> 18) & 0xfffc,

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= MX1_PHYS_OFFSET + 0x100,

	.map_io		= mx1_map_io,

	.init_irq	= mx1_init_irq,

	.timer		= &mx1ads_timer,
@@ -157,7 +157,7 @@ MACHINE_END 
MACHINE_START(MXLADS, "Freescale MXLADS")

	.phys_io	= IMX_IO_PHYS,

	.io_pg_offst	= (IMX_IO_BASE >> 18) & 0xfffc,

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= MX1_PHYS_OFFSET + 0x100,

	.map_io		= mx1_map_io,

	.init_irq	= mx1_init_irq,

	.timer		= &mx1ads_timer,

arch/arm/mach-mx2/mach-cpuimx27.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static struct sys_timer eukrea_cpuimx27_timer = { 
MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")

	.phys_io        = MX27_AIPI_BASE_ADDR,

	.io_pg_offst    = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,

	.boot_params    = PHYS_OFFSET + 0x100,

	.boot_params    = MX27_PHYS_OFFSET + 0x100,

	.map_io         = mx27_map_io,

	.init_irq       = mx27_init_irq,

	.init_machine   = eukrea_cpuimx27_init,

arch/arm/mach-mx2/mach-imx27lite.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static struct sys_timer mx27lite_timer = { 
MACHINE_START(IMX27LITE, "LogicPD i.MX27LITE")

	.phys_io        = MX27_AIPI_BASE_ADDR,

	.io_pg_offst    = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,

	.boot_params    = PHYS_OFFSET + 0x100,

	.boot_params    = MX27_PHYS_OFFSET + 0x100,

	.map_io         = mx27_map_io,

	.init_irq       = mx27_init_irq,

	.init_machine   = mx27lite_init,

arch/arm/mach-mx2/mach-mx21ads.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ MACHINE_START(MX21ADS, "Freescale i.MX21ADS") 
	/* maintainer: Freescale Semiconductor, Inc. */

	.phys_io        = MX21_AIPI_BASE_ADDR,

	.io_pg_offst    = ((MX21_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,

	.boot_params    = PHYS_OFFSET + 0x100,

	.boot_params    = MX21_PHYS_OFFSET + 0x100,

	.map_io         = mx21ads_map_io,

	.init_irq       = mx21_init_irq,

	.init_machine   = mx21ads_board_init,

arch/arm/mach-mx2/mach-mx27_3ds.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ MACHINE_START(MX27_3DS, "Freescale MX27PDK") 
	/* maintainer: Freescale Semiconductor, Inc. */

	.phys_io        = MX27_AIPI_BASE_ADDR,

	.io_pg_offst    = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,

	.boot_params    = PHYS_OFFSET + 0x100,

	.boot_params    = MX27_PHYS_OFFSET + 0x100,

	.map_io         = mx27_map_io,

	.init_irq       = mx27_init_irq,

	.init_machine   = mx27pdk_init,