diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-07-01 00:10:49 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-07-01 01:29:52 +0100 |
| commit | 574d6014c4f931de02a8003b204d9cb4b618e6e9 (patch) | |
| tree | c66edbe6b6361464c4a60abc8286c5d6d82e1f81 | |
| parent | 524998eb1ab1b83d6f38f1ddee986791c7f6376b (diff) | |
OMAP4: Panda: add uEnv.txt support
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | include/configs/omap4_panda.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 1e6e056e4..1b5ee61f6 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -174,6 +174,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ + "pxecfg_ram=0x88000000\0" \ "console=ttyS2,115200n8\0" \ "usbtty=cdc_acm\0" \ "vram=16M\0" \ @@ -189,6 +190,9 @@ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\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; " \ @@ -198,10 +202,15 @@ "if mmc rescan ${mmcdev}; then " \ "if run loadbootscript; then " \ "run bootscript; " \ - "else " \ - "if run loaduimage; then " \ - "run mmcboot; " \ - "fi; " \ + "elif run loadbootenv; then " \ + "run importbootenv;" \ + "fi;" \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "if run loaduimage; then " \ + "run mmcboot; " \ "fi; " \ "fi; " \ "if usb start; then " \ |