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 f9647e13583f262a0fd78a389405027bc2108adb..551429c8431fe5a0ab0d322b0e68872a3e0d7963 100644 (file)
--- 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