[U-Boot] [RFC 03/10] board_r: only assign gd when requested

Jeroen Hofstee
2014-05-31T20:32:17Z

When CONFIG_SYS_GENERIC_GLOBAL_DATA is not set the arch handles
the assignment of gd. At least in case of ARM/Aarch64 this means
board_init_r is alteady called with the new gd. Therefore only
assign gd if CONFIG_SYS_GENERIC_GLOBAL_DATA is defined.
---
common/board_r.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/board_r.c b/common/board_r.c
index 602a239..18bbe26 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -927,7 +927,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
int i;
#endif

-#ifndef CONFIG_X86
+#ifdef CONFIG_SYS_GENERIC_GLOBAL_DATA
gd = new_gd;
#endif

--
1.8.3.2