diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-07-01 00:10:49 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-04-19 02:18:37 -0600 |
| commit | 0b709966e5705c01e1a349350747a0690174baa8 (patch) | |
| tree | 1d891527bc4654efc29daaf6fe81c87dee37c6b1 | |
| parent | d8228d36c7554cbc4cfad3d2cb4059b41227608d (diff) | |
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.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 2e2af1a4a..51b101427 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -162,9 +162,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; " \ @@ -184,7 +188,15 @@ #else #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 " \ |