[U-Boot] [PATCH] 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 --- include/configs/ti_armv7_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index d15850b..07730c9 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -203,7 +203,7 @@
#ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SPL_ENV_SUPPORT /* For 'boot_os' and similar */ -#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"

On Fri, Oct 04, 2013 at 10:51:40AM -0400, Tom Rini wrote:
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
Applied to u-boot-ti/master, thanks!
participants (1)
-
Tom Rini