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-07-01 00:09:58 +0100
commit524998eb1ab1b83d6f38f1ddee986791c7f6376b (patch)
tree3e9d1f50e57c9a76a649476548ecfc69b08a319d
parentd48a07356ada8ddbcda70f940f6d6654abae10dc (diff)
downloadu-boot-linaro-stable-524998eb1ab1b83d6f38f1ddee986791c7f6376b.tar.gz
OMAP3: Beagle: add back boot.scr support
uEnv.txt still works but so does boot.scr Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--include/configs/omap3_beagle.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 9fd80ed50..ea3855beb 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -226,6 +226,9 @@
"omapdss.def_disp=${defaultdisplay} " \
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ "bootscript=echo Running bootscript from mmc ...; " \
+ "source ${loadaddr}\0" \
"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
"importbootenv=echo Importing environment from mmc ...; " \
"env import -t $loadaddr $filesize\0" \
@@ -241,7 +244,9 @@
#define CONFIG_BOOTCOMMAND \
"if mmc rescan ${mmcdev}; then " \
"echo SD/MMC found on device ${mmcdev};" \
- "if run loadbootenv; then " \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "elif run loadbootenv; then " \
"run importbootenv;" \
"fi;" \
"if test -n $uenvcmd; then " \