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>2012-12-06 12:16:43 -0700
commitb013c8951c90f1d965d51d52b162e3fea06e3800 (patch)
treeebaa8ab27aed97a0113de6856847a495b73c556b
parent1515ccd93c14ae1184b1a381bd3b3de5197a3a6e (diff)
downloadu-boot-linaro-stable-b013c8951c90f1d965d51d52b162e3fea06e3800.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 7bf1c1bd4..eec630bfb 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -158,9 +158,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; " \
@@ -180,7 +184,15 @@
#else
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; 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 " \