X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Flib%2Fspl.c;h=d737a5cce83dcc867a30a6487206e8ed7402e858;hb=8d8e13e129f20ef82a271094eb713d513e83adf4;hp=75ab546923f298f4238b784684e120a146002d75;hpb=114cc4290b2f24bb314edf2edd5d8738a0778c4b;p=u-boot

diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index 75ab546923..d737a5cce8 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -13,9 +13,16 @@
 #include <image.h>
 #include <linux/compiler.h>
 
+#ifndef CONFIG_SPL_DM
 /* Pointer to as well as the global data structure for SPL */
 DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * WARNING: This is going away very soon. Don't use it and don't submit
+ * pafches that rely on it. The global_data area is set up in crt0.S.
+ */
 gd_t gdata __attribute__ ((section(".data")));
+#endif
 
 /*
  * In the context of SPL, board_init_f must ensure that any clocks/etc for
@@ -28,6 +35,11 @@ void __weak board_init_f(ulong dummy)
 	/* Clear the BSS. */
 	memset(__bss_start, 0, __bss_end - __bss_start);
 
+#ifndef CONFIG_SPL_DM
+	/* TODO: Remove settings of the global data pointer here */
+	gd = &gdata;
+#endif
+
 	board_init_r(NULL, 0);
 }