aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-07-01 00:10:49 +0100
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 07:10:45 -0600
commit63098e48c2fbf36d94c14603540a71fb28478eb5 (patch)
tree5f38b9ec6b12d41e52d0ee104f08ebd601747be3
parent6588b8a81e0fd87495aecc0123cb236e6032b2dd (diff)
downloadu-boot-linaro-stable-63098e48c2fbf36d94c14603540a71fb28478eb5.tar.gz
OMAP4: Panda: add uEnv.txt support
Identical to omap3_beagle. Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--include/configs/omap4_common.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 7e23110cb..7b0c2e3ee 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -155,9 +155,13 @@
"vram=${vram} " \
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ "bootscr=boot.scr\0" \
+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \
+ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
+ "importbootenv=echo Importing environment from mmc ...; " \
+ "env import -t $loadaddr $filesize\0" \
"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
"mmcboot=echo Booting from mmc${mmcdev} ...; " \
"run mmcargs; " \
@@ -169,7 +173,15 @@
#define CONFIG_BOOTCOMMAND \
"if mmc rescan ${mmcdev}; then " \
- "if run loadbootscript; then " \
+ "if run loadbootenv; then " \
+ "echo Loaded environment from ${bootenv};" \
+ "run importbootenv;" \
+ "if test -n $uenvcmd; then " \
+ "echo Running uenvcmd ...;" \
+ "run uenvcmd;" \
+ "fi;" \
+ "elif run loadbootscript; then " \
+ "echo Loaded script from ${bootscr};" \
"run bootscript; " \
"else " \
"if run loaduimage; then " \