diff mbox series

[v5,05/14] smegw01: Run altbootcmd in the case of failure

Message ID 20230426160501.1199085-5-festevam@gmail.com
State Accepted
Commit 440dc0694ba44ed8551f8809f76373f20800987f
Delegated to: Stefano Babic
Headers show
Series [v5,01/14] smegw01: Enable setting additional boot params | expand

Commit Message

Fabio Estevam April 26, 2023, 4:04 p.m. UTC 
From: Eduard Strehlau <eduard@lionizers.com>

Run the altbootcmd script if any step of bootcmd fails.

This ensures that always a valid image can be run.

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

 configs/smegw01_defconfig | 2 +-
 include/configs/smegw01.h | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

Comments

Stefano Babic May 2, 2023, 12:47 p.m. UTC | #1 
> From: Eduard Strehlau <eduard@lionizers.com>
> Run the altbootcmd script if any step of bootcmd fails.
> This ensures that always a valid image can be run.
> Signed-off-by: Eduard Strehlau <eduard@lionizers.com>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig
index 418151a6de05..b3580d5d6e54 100644
--- a/configs/smegw01_defconfig
+++ b/configs/smegw01_defconfig
@@ -18,7 +18,7 @@  CONFIG_SYS_MEMTEST_END=0xa0000000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; if run loadimage; then run mmcboot; fi; "
+CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; if run loadimage; then run mmcboot; else run altbootcmd; fi; "
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h
index 6ee4acc70d29..05edaac42f8e 100644
--- a/include/configs/smegw01.h
+++ b/include/configs/smegw01.h
@@ -39,7 +39,13 @@ 
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"if run loadfdt; then " \
-			"bootz ${loadaddr} - ${fdt_addr}; " \
+			"if bootz ${loadaddr} - ${fdt_addr}; then " \
+				"; " \
+			"else " \
+				"run altbootcmd; " \
+			"fi;" \
+		"else " \
+			"run altbootcmd; " \
 		"fi;\0" \
 	"altbootcmd=echo Performing rollback...; " \
 		"if test \"${mmcpart}\" = 1; then " \