Merge branch 'master' of git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 6ac2b7e1601ec5e54230596a1114ca0262dfc063..231c6d67115e871eb10c5619fc5227e413a1ea53 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -915,7 +915,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