diff options
| author | John Rigby <john.rigby@linaro.org> | 2012-02-16 08:43:20 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-12-06 12:16:44 -0700 |
| commit | fd9585c2e1bd1bfeb2e2d65729d37d4845793968 (patch) | |
| tree | 6f19e876831f064bde128bd4ae76e8137d92b0c8 | |
| parent | a895321ff9d640f3881625f435f0aa4b1c7643b0 (diff) | |
OMAP4: add preEnv.txt support
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | include/configs/omap4_common.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 748d1c60a..242c4d0f8 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -162,7 +162,12 @@ "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" \ + "preenv=preEnv.txt\0" \ + "loadpreenv=fatload mmc ${mmcdev} ${loadaddr} ${preenv}\0" \ + "importpreenv=echo Importing preboot environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ + "bootenv=uEnv.txt\0" \ + "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ "importbootenv=echo Importing environment from mmc ...; " \ "env import -t $loadaddr $filesize\0" \ "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ @@ -182,6 +187,18 @@ "pxe boot;" \ "fi" #else +#define CONFIG_PREBOOT \ + "echo checking for ${preenv};" \ + "if mmc rescan ${mmcdev}; then " \ + "if run loadpreenv; then " \ + "echo Loaded environment from ${preenv};" \ + "run importpreenv;" \ + "if test -n $preenvcmd; then " \ + "echo Running preenvcmd ...;" \ + "run preenvcmd;" \ + "fi;" \ + "fi; " \ + "fi" #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootenv; then " \ |