diff options
| author | John Rigby <john.rigby@linaro.org> | 2012-02-16 08:43:20 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-04-23 07:48:54 -0600 |
| commit | 1551b1a324406ac51ea9a4d17a0efe8bdeee93d1 (patch) | |
| tree | 8c6bf1ccd782338e73ffd4ec6889bf992938c673 | |
| parent | 0a957f5694f82a2c0f9d6c327ea6adf9cb2eaa79 (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 3c12c0da4..4e019facb 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -166,7 +166,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" \ @@ -186,6 +191,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 \ "if mmc rescan ${mmcdev}; then " \ "if run loadbootenv; then " \ |