From 74707515e74306a9793d900337116746ac4a8733 Mon Sep 17 00:00:00 2001 From: John Rigby Date: Thu, 16 Feb 2012 08:43:20 -0700 Subject: OMAP4: add preEnv.txt support Signed-off-by: John Rigby --- include/configs/omap4_common.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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 " \ -- cgit v1.2.3