From: Tom Rini <trini@ti.com>
Date: Tue, 16 Sep 2014 15:08:46 +0000 (-0400)
Subject: Revert "ARM: SPL: do not set gd again"
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=1ee30aeed47724eb7c8f145f064b8d03cd294808;p=u-boot.git

Revert "ARM: SPL: do not set gd again"

At the high level, the problem is that we set gd multiple times (and
still do, even after the commit we're reverting).  We set important
parts of gd to the copy which is not above stack but rather in the data
section.  For the release, we're going to revert this change and for the
next release we shall correct things to only, really, set gd once to an
appropriate location and ensure that comments about it are correct too.

This reverts commit f0c3a6c4ad09210d5d4aeafe87685ee75e5683d6.

Acked-by: Albert Aribaud <albert.u.boot@aribaud.net>
Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index 75ab546923..dfcc596815 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -28,6 +28,9 @@ void __weak board_init_f(ulong dummy)
 	/* Clear the BSS. */
 	memset(__bss_start, 0, __bss_end - __bss_start);
 
+	/* Set global data pointer. */
+	gd = &gdata;
+
 	board_init_r(NULL, 0);
 }