leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: mach-u300: convert boot_params to atag_offset

Browse Source 
Someone was smoking good stuff with CONFIG_MACH_U300_2MB_ALIGNMENT_FIX here...

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Nicolas Pitre 2011-07-05 22:38:18 -04:00 committed by Nicolas Pitre
parent b61cafee2e
commit 4611b68922
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-u300/include/mach/memory.h
View File

@ -16,7 +16,7 @@
#ifdef CONFIG_MACH_U300_DUAL_RAM #ifdef CONFIG_MACH_U300_DUAL_RAM
#define PLAT_PHYS_OFFSET UL(0x48000000) #define PLAT_PHYS_OFFSET UL(0x48000000)
#define BOOT_PARAMS_OFFSET (PHYS_OFFSET + 0x100) #define BOOT_PARAMS_OFFSET 0x100
#else #else
@ -24,14 +24,14 @@
#define PLAT_PHYS_OFFSET (0x28000000 + \ #define PLAT_PHYS_OFFSET (0x28000000 + \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE - \ (CONFIG_MACH_U300_ACCESS_MEM_SIZE - \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024) (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 #else
#define PLAT_PHYS_OFFSET (0x28000000 + \ #define PLAT_PHYS_OFFSET (0x28000000 + \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE + \ (CONFIG_MACH_U300_ACCESS_MEM_SIZE + \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024) (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
#define BOOT_PARAMS_OFFSET 0x100
#endif #endif
#define BOOT_PARAMS_OFFSET (0x28000000 + \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE + \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100)
#endif #endif
/* /*

2
arch/arm/mach-u300/u300.c
View File

@ -61,7 +61,7 @@ static void __init u300_init_machine(void)
MACHINE_START(U300, MACH_U300_STRING) MACHINE_START(U300, MACH_U300_STRING)
/* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */ /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
.boot_params = BOOT_PARAMS_OFFSET, .atag_offset = BOOT_PARAMS_OFFSET,
.map_io = u300_map_io, .map_io = u300_map_io,
.reserve = u300_reserve, .reserve = u300_reserve,
.init_irq = u300_init_irq, .init_irq = u300_init_irq,