From: Simon Glass <sjg@chromium.org>
Date: Thu, 14 May 2015 03:15:21 +0000 (-0600)
Subject: spl: Correct address in spl_relocate_stack_gd()
X-Git-Tag: v2015.07-rc2~248
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce49e79450ce4889616d4ee079a7963aa59f183c;p=oweals%2Fu-boot.git

spl: Correct address in spl_relocate_stack_gd()

During the Kconfig conversion one of the changes was missed.
CONFIG_SPL_STACK_R should be CONFIG_SPL_STACK_R_ADDR since we want the
address.

Reported-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 690c9b04ff..aeb0645eda 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -328,7 +328,7 @@ ulong spl_relocate_stack_gd(void)
 	ulong ptr;
 
 	/* Get stack position: use 8-byte alignment for ABI compliance */
-	ptr = CONFIG_SPL_STACK_R - sizeof(gd_t);
+	ptr = CONFIG_SPL_STACK_R_ADDR - sizeof(gd_t);
 	ptr &= ~7;
 	new_gd = (gd_t *)ptr;
 	memcpy(new_gd, (void *)gd, sizeof(gd_t));