aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-06-30 18:00:00 +0100
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 07:10:45 -0600
commit6588b8a81e0fd87495aecc0123cb236e6032b2dd (patch)
treeebdea8ac375ce2a90999af939b5802aba46d369f
parent4ebd53327049341c6fc4445c5ad211ed91606d4b (diff)
downloadu-boot-linaro-stable-6588b8a81e0fd87495aecc0123cb236e6032b2dd.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>
-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 1369c89e4..f45c940de 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -255,6 +255,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} " \
@@ -287,10 +291,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;" \