From 1b7380f8d8508840af186d453a5ff0189d1744a4 Mon Sep 17 00:00:00 2001 From: Jeremy Herbert Date: Mon, 9 Mar 2015 20:00:55 -0700 Subject: [PATCH] zynq: Load environment variables at preboot for SD Try to load environment variables from uEnv.txt at preboot for SD card boot. Signed-off-by: Jeremy Herbert Signed-off-by: Michal Simek --- include/configs/zynq-common.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 6c379097c05..f1c1caa3393 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -239,6 +239,7 @@ #endif /* Default environment */ +#define CONFIG_PREBOOT #define CONFIG_EXTRA_ENV_SETTINGS \ "ethaddr=00:0a:35:00:01:22\0" \ "kernel_image=uImage\0" \ @@ -261,6 +262,12 @@ "loadbootenv=load mmc 0 ${loadbootenv_addr} ${bootenv}\0" \ "importbootenv=echo Importing environment from SD ...; " \ "env import -t ${loadbootenv_addr} $filesize\0" \ + "sd_uEnvtxt_existence_test=test -e mmc 0 /uEnv.txt\0" \ + "preboot=if test $modeboot = sdboot && env run sd_uEnvtxt_existence_test; " \ + "then if env run loadbootenv; " \ + "then env run importbootenv; " \ + "fi; " \ + "fi; \0" \ "mmc_loadbit=echo Loading bitstream from SD/MMC/eMMC to RAM.. && " \ "mmcinfo && " \ "load mmc 0 ${loadbit_addr} ${bitstream_image} && " \ -- 2.47.3