From aae2aef9c807a13ec9074efe48fae5bb5e3c6039 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 10 Jul 2014 22:23:26 -0600 Subject: arm: Set up global data before board_init_f() At present arm defines CONFIG_SYS_GENERIC_GLOBAL_DATA, meaning that the global_data pointer is set up in board_init_f(). However it is actually set up before this, it just isn't zeroed. If we zero the global data before calling board_init_f() then we don't need to define CONFIG_SYS_GENERIC_GLOBAL_DATA. Make this change (on arm32 only) to simplify the init process. I don't have the ability to test aarch64 yet. Signed-off-by: Simon Glass Acked-by: Tom Rini --- arch/arm/include/asm/config.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/include') diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index d3433dafd9f..5f2a5f4ea9f 100644 --- a/arch/arm/include/asm/config.h +++ b/arch/arm/include/asm/config.h @@ -7,7 +7,9 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +#ifdef __aarch64__ #define CONFIG_SYS_GENERIC_GLOBAL_DATA +#endif #define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH -- cgit v1.2.3