From: Eduard Strehlau <edu...@lionizers.com>
Two conflicting bootcmds were included in the environment.
Streamline to defining the bootcmd only in the env file.
Signed-off-by: Eduard Strehlau <edu...@lionizers.com>
Signed-off-by: Fabio Estevam <feste...@denx.de>
---
Tom,
Stefano is out this week. Could you please apply this one
directly so that it gets included in 2023.07?
Thanks
board/storopack/smegw01/smegw01.env | 11 ++++++++++-
configs/smegw01_defconfig | 2 --
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/board/storopack/smegw01/smegw01.env
b/board/storopack/smegw01/smegw01.env
index 25bc7cdbd28b..1263ddac8ed0 100644
--- a/board/storopack/smegw01/smegw01.env
+++ b/board/storopack/smegw01/smegw01.env
@@ -29,7 +29,16 @@ altbootcmd=
run bootcmd;
boot_emmc=setenv mmcdev_wanted 1; run persist_mmcdev; run bootcmd;
boot_sd=setenv mmcdev_wanted 0; run persist_mmcdev; run bootcmd;
-bootcmd=run finduuid; run distro_bootcmd
+bootcmd=
+ if test "${bootcount}" -gt "${bootlimit}"; then
+ run altbootcmd;
+ else
+ if test "${ustate}" = 1; then
+ setenv upgrade_available 1;
+ saveenv;
+ fi;
+ run mmcboot;
+ fi;
bootdelay=2
bootlimit=3
bootm_size=0x10000000
diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig
index 3d43c9b996e0..7f1b2bee8e16 100644
--- a/configs/smegw01_defconfig
+++ b/configs/smegw01_defconfig
@@ -21,8 +21,6 @@ CONFIG_FIT_VERBOSE=y
# CONFIG_BOOTSTD is not set
CONFIG_AUTOBOOT_MENU_SHOW=y
CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE=y
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="if test \"${bootcount}\" -gt \"${bootlimit}\"; then run
altbootcmd; else if test \"${ustate}\" = 1; then setenv upgrade_available 1;
saveenv; fi; run mmcboot; fi;"
CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="run setup_boot_menu;"
CONFIG_HUSH_PARSER=y
--
2.34.1
