From: Jeroen Hofstee <jeroen@myspectrum.nl>
Date: Wed, 30 Jul 2014 19:54:49 +0000 (+0200)
Subject: board_r: ARM[64] do not set gd again
X-Git-Tag: v2014.10-rc3~116^2~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=47a602eab43fc2a3ce402efd5e7baee3a8a3fffb;p=u-boot

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>
---

diff --git a/common/board_r.c b/common/board_r.c
index f9647e1358..551429c843 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