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

Commit 4611b689 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: mach-u300: convert boot_params to atag_offset 



Someone was smoking good stuff with CONFIG_MACH_U300_2MB_ALIGNMENT_FIX here...

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent b61cafee

arch/arm/mach-u300/include/mach/memory.h

+4 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#ifdef CONFIG_MACH_U300_DUAL_RAM



#define PLAT_PHYS_OFFSET		UL(0x48000000)

#define BOOT_PARAMS_OFFSET	(PHYS_OFFSET + 0x100)

#define BOOT_PARAMS_OFFSET		0x100



#else
@@ -24,14 +24,14 @@ 
#define PLAT_PHYS_OFFSET (0x28000000 + \

	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE - \

	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)

#define BOOT_PARAMS_OFFSET (0x100 + \

	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1)*1024*1024*2)

#else

#define PLAT_PHYS_OFFSET (0x28000000 + \

	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE +	\

	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)

#define BOOT_PARAMS_OFFSET 0x100

#endif

#define BOOT_PARAMS_OFFSET (0x28000000 + \

	    (CONFIG_MACH_U300_ACCESS_MEM_SIZE +		\

	    (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100)

#endif



/*

arch/arm/mach-u300/u300.c

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


MACHINE_START(U300, MACH_U300_STRING)

	/* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */

	.boot_params	= BOOT_PARAMS_OFFSET,

	.atag_offset	= BOOT_PARAMS_OFFSET,

	.map_io		= u300_map_io,

	.reserve	= u300_reserve,

	.init_irq	= u300_init_irq,