diff mbox

[U-Boot,v2,1/8] board_r: ARM[64] do not set gd again

Message ID 1406750096-7281-2-git-send-email-jeroen@myspectrum.nl
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Jeroen Hofstee July 30, 2014, 7:54 p.m. UTC 
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>
---
 common/board_r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/common/board_r.c b/common/board_r.c
index 8e7a3ac..c01d9cd 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -911,7 +911,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