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>2012-04-23 07:48:52 -0600
commit923c7d8b90056064a5b12e4f3a008a691a489383 (patch)
treec0135d8516c5519053a8462bf8c7626f4c51bf20
parentf1ed411656bdd7f0740269934086b50134d814d1 (diff)
downloadu-boot-linaro-stable-923c7d8b90056064a5b12e4f3a008a691a489383.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 9590c26d2..a7637fabf 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -271,6 +271,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} " \
@@ -312,10 +316,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;" \