summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/config.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-07-10 22:23:26 -0600
committerSimon Glass <sjg@chromium.org>2014-08-04 05:23:59 -0600
commitaae2aef9c807a13ec9074efe48fae5bb5e3c6039 (patch)
tree3b537768461423e5eccec8cc43aa5a47d423189b /arch/arm/include/asm/config.h
parent25b4adbba018633b943a99322bfb2fb819c0bafb (diff)
downloadu-boot-aae2aef9c807a13ec9074efe48fae5bb5e3c6039.tar.gz
u-boot-aae2aef9c807a13ec9074efe48fae5bb5e3c6039.tar.xz
u-boot-aae2aef9c807a13ec9074efe48fae5bb5e3c6039.zip
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 <sjg@chromium.org> Acked-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/include/asm/config.h')
-rw-r--r--arch/arm/include/asm/config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index d3433dafd9..5f2a5f4ea9 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