summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2015-01-08 18:18:25 +0100
committerTom Rini <trini@ti.com>2015-01-09 10:27:51 -0500
commitb188067f39627d977bb1db67c8456e9aaab90743 (patch)
treed014310285b33d1c1fb6a19d7f8a137d07f04bb2
parent75d7a0d7f11ef66dcd3c27ae141f6b59f2ffd00d (diff)
arm: vf610: fix boot from SD-card
Boot from SD-card (and probably also from NAND) was broken since commit d6d07a9bec ("arm: vf610: add NAND support for vf610twr"). It looks like the increased size of U-Boot lead to a situation where the boot ROM overwrote its own stack/heap while loading U-Boot from the SD-card to the SRAM. However, U-Boot worked fine when loaded through USB serial loader directly into SRAM. It looks like loading from SD-card uses other stack/heap location then the serial loader (or maybe no stack or heap at all). This fix moves U-Boot to gfxRAM, which is 512kB in size and is not used by the boot ROM nor the SD-card loader of it. Signed-off-by: Stefan Agner <stefan@agner.ch> Acked-by: Bill Pringlemeir <bpringlemeir@nbsps.com>
-rw-r--r--include/configs/vf610twr.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 6fd0b173eb..bd79e81062 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -125,7 +125,10 @@
#define CONFIG_BOOTDELAY 3
#define CONFIG_LOADADDR 0x82000000
-#define CONFIG_SYS_TEXT_BASE 0x3f008000
+
+/* We boot from the gfxRAM area of the OCRAM. */
+#define CONFIG_SYS_TEXT_BASE 0x3f408000
+#define CONFIG_BOARD_SIZE_LIMIT 524288
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \