From: Arnd Bergmann Date: Fri, 26 Aug 2011 17:02:36 +0000 (+0000) Subject: Merge branch 'rmk/devel-stable' into for-next X-Git-Tag: next-20110829~91^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fb3cc8bd24fbf454d6c9abba1dbd22098890c0c4;p=karo-tx-linux.git Merge branch 'rmk/devel-stable' into for-next Conflicts: arch/arm/mach-u300/include/mach/memory.h --- fb3cc8bd24fbf454d6c9abba1dbd22098890c0c4 diff --cc arch/arm/mach-u300/include/mach/memory.h index 02bd832f063e,7034bae95de6..c808f347a081 --- a/arch/arm/mach-u300/include/mach/memory.h +++ b/arch/arm/mach-u300/include/mach/memory.h @@@ -13,12 -13,25 +13,7 @@@ #ifndef __MACH_MEMORY_H #define __MACH_MEMORY_H -#ifdef CONFIG_MACH_U300_DUAL_RAM - -#define PLAT_PHYS_OFFSET UL(0x48000000) -#define BOOT_PARAMS_OFFSET 0x100 - -#else - -#ifdef CONFIG_MACH_U300_2MB_ALIGNMENT_FIX -#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 -#endif +#define PLAT_PHYS_OFFSET UL(0x48000000) - #define BOOT_PARAMS_OFFSET (PLAT_PHYS_OFFSET + 0x100) - - /* - * We enable a real big DMA buffer if need be. - */ - #define CONSISTENT_DMA_SIZE SZ_4M ++#define BOOT_PARAMS_OFFSET 0x100 #endif diff --cc arch/arm/mach-u300/u300.c index 25d11bac2a10,80e7305589c6..89422ee7f3a8 --- a/arch/arm/mach-u300/u300.c +++ b/arch/arm/mach-u300/u300.c @@@ -46,8 -61,9 +46,8 @@@ static void __init u300_init_machine(vo MACHINE_START(U300, MACH_U300_STRING) /* Maintainer: Linus Walleij */ - .boot_params = BOOT_PARAMS_OFFSET, + .atag_offset = BOOT_PARAMS_OFFSET, .map_io = u300_map_io, - .reserve = u300_reserve, .init_irq = u300_init_irq, .timer = &u300_timer, .init_machine = u300_init_machine,