From: Tom Rini <trini@ti.com>
Date: Fri, 4 Oct 2013 14:51:40 +0000 (-0400)
Subject: TI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher address
X-Git-Tag: v2014.01-rc1~77^2~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=552998e5f7655ba8fd3acff400012bd651edff06;p=oweals%2Fu-boot.git

TI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher address

With changes to increase the size of the device tree (required to move
more data out of the kernel and into DT), loading the args at the old
address leads to us overwriting things later on.  To correct this, load
the args file to where we load the device tree anyhow.  This is also
safe for non-DT booting as in either case we use r2 to pass in the
location of things.

Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index e89e8744df..13ed875135 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -202,7 +202,7 @@
 #define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
 
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_SPL_ARGS_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x100)
+#define CONFIG_SYS_SPL_ARGS_ADDR		0x80F80000
 
 /* FAT */
 #define CONFIG_SPL_FAT_LOAD_KERNEL_NAME		"uImage"