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

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

Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable

parents 0cd21ebc af687168

arch/arm/include/asm/mach/arch.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct sys_timer; 
struct machine_desc {

	unsigned int		nr;		/* architecture number	*/

	const char		*name;		/* architecture name	*/

	unsigned long		boot_params;	/* tagged list		*/

	unsigned long		atag_offset;	/* tagged list (relative) */

	const char		**dt_compat;	/* array of device tree

						 * 'compatible' strings	*/

arch/arm/kernel/setup.c

+2 −19
Original line number Diff line number Diff line
@@ -819,25 +819,8 @@ static struct machine_desc * __init setup_machine_tags(unsigned int nr) 


	if (__atags_pointer)

		tags = phys_to_virt(__atags_pointer);

	else if (mdesc->boot_params) {

#ifdef CONFIG_MMU

		/*

		 * We still are executing with a minimal MMU mapping created

		 * with the presumption that the machine default for this

		 * is located in the first MB of RAM.  Anything else will

		 * fault and silently hang the kernel at this point.

		 */

		if (mdesc->boot_params < PHYS_OFFSET ||

		    mdesc->boot_params >= PHYS_OFFSET + SZ_1M) {

			printk(KERN_WARNING

			       "Default boot params at physical 0x%08lx out of reach\n",

			       mdesc->boot_params);

		} else

#endif

		{

			tags = phys_to_virt(mdesc->boot_params);

		}

	}

	else if (mdesc->atag_offset)

		tags = (void *)(PAGE_OFFSET + mdesc->atag_offset);



#if defined(CONFIG_DEPRECATED_PARAM_STRUCT)

	/*

arch/arm/mach-clps711x/autcpu12.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ void __init autcpu12_map_io(void) 


MACHINE_START(AUTCPU12, "autronix autcpu12")

	/* Maintainer: Thomas Gleixner */

	.boot_params	= 0xc0020000,

	.atag_offset	= 0x20000,

	.map_io		= autcpu12_map_io,

	.init_irq	= clps711x_init_irq,

	.timer		= &clps711x_timer,

arch/arm/mach-clps711x/cdb89712.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void __init cdb89712_map_io(void) 


MACHINE_START(CDB89712, "Cirrus-CDB89712")

	/* Maintainer: Ray Lehtiniemi */

	.boot_params	= 0xc0000100,

	.atag_offset	= 0x100,

	.map_io		= cdb89712_map_io,

	.init_irq	= clps711x_init_irq,

	.timer		= &clps711x_timer,

arch/arm/mach-clps711x/ceiva.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void __init ceiva_map_io(void) 


MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")

	/* Maintainer: Rob Scott */

	.boot_params	= 0xc0000100,

	.atag_offset	= 0x100,

	.map_io		= ceiva_map_io,

	.init_irq	= clps711x_init_irq,

	.timer		= &clps711x_timer,