summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Hofstee <jeroen@myspectrum.nl>2014-07-30 21:54:49 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-09-09 13:50:45 +0200
commit47a602eab43fc2a3ce402efd5e7baee3a8a3fffb (patch)
tree2995ad87506f99b3442c99c433cb9ba734787698
parenta6bc0195dba895fa0e9facc718d17eb098695685 (diff)
downloadu-boot-imx-47a602eab43fc2a3ce402efd5e7baee3a8a3fffb.zip
u-boot-imx-47a602eab43fc2a3ce402efd5e7baee3a8a3fffb.tar.gz
u-boot-imx-47a602eab43fc2a3ce402efd5e7baee3a8a3fffb.tar.bz2
board_r: ARM[64] do not set gd again
For ARM / ARM64 the relocation routines already updated gd to the new value. Don't set it again. This allows compilation with clang as it cannot update gd directly. cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
-rw-r--r--common/board_r.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c
index f9647e1..551429c 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -912,7 +912,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
int i;
#endif
-#ifndef CONFIG_X86
+#if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64)
gd = new_gd;
#endif