Message ID | 1431573322-11460-1-git-send-email-sjg@chromium.org |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Wed, May 13, 2015 at 09:15:21PM -0600, Simon Glass wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/common/spl/spl.c b/common/spl/spl.c index 690c9b0..aeb0645 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));
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. Signed-off-by: Simon Glass <sjg@chromium.org> --- common/spl/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)