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-08-15 15:10:48 -0600
commit1d212b2f85338deaa44d0db5488b9dc22a5358b1 (patch)
tree9c807e4f4420c9adba3f5dda7553eae9f4fa8cbc
parentb8e6cf53bd692ec749304fbd7c04e11595e4f4ac (diff)
downloadu-boot-linaro-stable-1d212b2f85338deaa44d0db5488b9dc22a5358b1.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 d7cbc2fe6..a4f181522 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -225,6 +225,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" \
@@ -240,7 +243,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 " \