Skip to contentSkip to conversation

TI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher address

PATCH In review Tom Rini 1 participant 2 messages Oct 4, 2013 – Nov 4, 2013

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 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.

---
 include/configs/ti_armv7_common.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/ti_armv7_common.h +1 -1
index d15850b..07730c9 100644
@@ -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"
Signature · 1 line
1.7.9.5
author
#1 lore raw
Quoted 8 lines · Tom Rini

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.

Applied to u-boot-ti/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131104/ab2dfe2a/attachment.pgp>