mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
smegw01: Fix duplicate bootcmd
Two conflicting bootcmds were included in the environment. Streamline to defining the bootcmd only in the env file. Signed-off-by: Eduard Strehlau <eduard@lionizers.com> Signed-off-by: Fabio Estevam <festevam@denx.de>
This commit is contained in:
parent
f95232c6f0
commit
4347dec6b2
2 changed files with 10 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue