aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-06-30 18:00:00 +0100
committerJohn Rigby <john.rigby@linaro.org>2012-12-06 12:16:43 -0700
commit1515ccd93c14ae1184b1a381bd3b3de5197a3a6e (patch)
tree74f8684b46ed7650fd616c810fea13101f7f5177 /include
parentad235ea5f1c7c2ea00b6bfcb5203869984a5cbb8 (diff)
downloadu-boot-linaro-stable-1515ccd93c14ae1184b1a381bd3b3de5197a3a6e.tar.gz
OMAP3: Beagle: add back boot.scr support
Removing boot.scr support broke some external bootscripts that depended on it. This patch restores boot.scr support but leaves uEnv.txt support in. uEnv.txt still works and if both files exist then uEnv.txt takes precedence. Signed-off-by: John Rigby <john.rigby@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/configs/omap3_beagle.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 571053466..bd42750e2 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -273,6 +273,10 @@
"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
"importbootenv=echo Importing environment from mmc ...; " \
"env import -t $loadaddr $filesize\0" \
+ "bootscr=boot.scr\0" \
+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ "source ${loadaddr}\0" \
"ramargs=setenv bootargs console=${console} " \
"${optargs} " \
"mpurate=${mpurate} " \
@@ -314,10 +318,13 @@
"if run loadbootenv; then " \
"echo Loaded environment from ${bootenv};" \
"run importbootenv;" \
- "fi;" \
- "if test -n $uenvcmd; then " \
- "echo Running uenvcmd ...;" \
- "run uenvcmd;" \
+ "if test -n $uenvcmd; then " \
+ "echo Running uenvcmd ...;" \
+ "run uenvcmd;" \
+ "fi;" \
+ "elif run loadbootscript; then " \
+ "echo Loaded script from ${bootscr};" \
+ "run bootscript; "\
"fi;" \
"if run loaduimage; then " \
"run mmcboot;" \