From 158c6edbbe68bbe3602e02dae8987b04cd895a5b Mon Sep 17 00:00:00 2001 From: "H. Nikolaus Schaller" Date: Sat, 19 Dec 2015 15:41:58 +0100 Subject: [PATCH] LC15: don't try mmc0/1 if loadbootscript succeeded; don't store environment in eMMC Signed-off-by: H. Nikolaus Schaller --- include/configs/letux_cortex15.h | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/include/configs/letux_cortex15.h b/include/configs/letux_cortex15.h index ce67030f4c4..cc109e30cc4 100644 --- a/include/configs/letux_cortex15.h +++ b/include/configs/letux_cortex15.h @@ -25,6 +25,7 @@ #undef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND \ "echo bootcmd for LC15;" \ + "setenv mmcdev 0; " \ "if test ${dofastboot} -eq 1; then " \ "echo Boot fastboot requested, resetting dofastboot ...;" \ "setenv dofastboot 0; saveenv;" \ @@ -32,23 +33,24 @@ "fi;" \ "if run loadbootscript; then " \ "run bootscript;" \ + "else;" \ + "echo trying mmc0;" \ + "setenv mmcdev 0; " \ + "setenv bootpart 0:1; " \ + "setenv mmcroot /dev/mmcblk0p2 rw; " \ + "run findfdt; " \ + "run mmcboot;" \ + "echo trying mmc1;" \ + "setenv mmcdev 1; " \ + "setenv bootpart 1:1; " \ + "setenv mmcroot /dev/mmcblk1p2 rw; " \ + "run mmcboot;" \ "fi;" \ - "echo trying mmc0;" \ - "setenv mmcdev 0; " \ - "setenv bootpart 0:1; " \ - "setenv mmcroot /dev/mmcblk0p2 rw; " \ - "run findfdt; " \ - "run mmcboot;" \ - "echo trying mmc1;" \ - "setenv mmcdev 1; " \ - "setenv bootpart 1:1; " \ - "setenv mmcroot /dev/mmcblk1p2 rw; " \ - "run mmcboot;" \ "" #endif -if 1 /* for the moment disable environment */ +#if 0 /* for the moment, disable to store environment in eMMC */ #undef CONFIG_ENV_IS_IN_MMC #undef CONFIG_SYS_MMC_ENV_DEV #undef CONFIG_ENV_SIZE -- 2.39.5