summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-09-16 11:08:46 -0400
committerTom Rini <trini@ti.com>2014-09-16 12:24:00 -0400
commit1ee30aeed47724eb7c8f145f064b8d03cd294808 (patch)
treeb67099c6d995d3092f45d82727ca3224ea049ef2 /arch
parent016a954ee9df23def65db24af9dabf4928d6919c (diff)
downloadtalos-obmc-uboot-1ee30aeed47724eb7c8f145f064b8d03cd294808.tar.gz
talos-obmc-uboot-1ee30aeed47724eb7c8f145f064b8d03cd294808.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/lib/spl.c3
1 files changed, 3 insertions, 0 deletions
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);
}
OpenPOWER on IntegriCloud