[v4,13/14] smegw01: Fix fallback to altbootcmd

Message ID	20230426132533.1145591-13-festevam@gmail.com
State	Superseded
Delegated to:	Stefano Babic
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Fabio Estevam <festevam@gmail.com> To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam <festevam@denx.de> Subject: [PATCH v4 13/14] smegw01: Fix fallback to altbootcmd Date: Wed, 26 Apr 2023 10:25:32 -0300 Message-Id: <20230426132533.1145591-13-festevam@gmail.com> In-Reply-To: <20230426132533.1145591-1-festevam@gmail.com> References: <20230426132533.1145591-1-festevam@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	[v4,01/14] smegw01: Enable setting additional boot params \| expand [v4,01/14] smegw01: Enable setting additional boot params [v4,02/14] smegw01: Select CONFIG_CMD_SQUASHFS [v4,03/14] smegw01: Select bootcount support [v4,04/14] smegw01: Add altbootcmd [v4,05/14] smegw01: Run altbootcmd in the case of failure [v4,06/14] smegw01: Only commit to new partition if update was successful [v4,07/14] smegw01: Enable EMMC boot from multiple partitions [v4,08/14] smegw01: Change default boot device to eMMC [v4,09/14] smegw01: Switch to fitImage [v4,10/14] smegw01: Add lockdown U-Boot env support [v4,11/14] smegw01: Read the second MAC address [v4,12/14] smegw01: Disable additional boot menu options [v4,13/14] smegw01: Fix fallback to altbootcmd [v4,14/14] smegw01: Convert CFG_EXTRA_ENV_SETTINGS to an env file

Message ID

20230426132533.1145591-13-festevam@gmail.com

State

Superseded

Delegated to:

Stefano Babic

Headers

From: Fabio Estevam <festevam@gmail.com>
To: sbabic@denx.de
Cc: eduard@lionizers.com, u-boot@lists.denx.de,
 Fabio Estevam <festevam@denx.de>
Subject: [PATCH v4 13/14] smegw01: Fix fallback to altbootcmd
Date: Wed, 26 Apr 2023 10:25:32 -0300
Message-Id: <20230426132533.1145591-13-festevam@gmail.com>
In-Reply-To: <20230426132533.1145591-1-festevam@gmail.com>
References: <20230426132533.1145591-1-festevam@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

[v4,01/14] smegw01: Enable setting additional boot params | expand

Commit Message

Fabio Estevam April 26, 2023, 1:25 p.m. UTC

From: Eduard Strehlau <eduard@lionizers.com>

The bootcmd/altbootcmd mechanism is not invoked for bootmenus.
Manually compare bootcount and bootlimit to implement fallback on all
codepaths.

Signed-off-by: Eduard Strehlau <eduard@lionizers.com>
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Changes since v3:
- None

 configs/smegw01_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig
index fe8152f33e6e..3d2713f52807 100644
--- a/configs/smegw01_defconfig
+++ b/configs/smegw01_defconfig
@@ -23,7 +23,7 @@  CONFIG_AUTOBOOT_MENU_SHOW=y
 # CONFIG_CMD_BOOTEFI_BOOTMGR is not set
 CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE=y
 CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; run mmcboot; "
+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

[v4,13/14] smegw01: Fix fallback to altbootcmd

Commit Message

Patch