public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
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 v5 05/14] smegw01: Run altbootcmd in the case of failure
Date: Wed, 26 Apr 2023 13:04:52 -0300	[thread overview]
Message-ID: <20230426160501.1199085-5-festevam@gmail.com> (raw)
In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com>

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(-)

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 " \
-- 
2.34.1


  parent reply	other threads:[~2023-04-26 16:06 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-26 16:04 [PATCH v5 01/14] smegw01: Enable setting additional boot params Fabio Estevam
2023-04-26 16:04 ` [PATCH v5 02/14] smegw01: Select CONFIG_CMD_SQUASHFS Fabio Estevam
2023-05-02 12:46   ` sbabic
2023-04-26 16:04 ` [PATCH v5 03/14] smegw01: Select bootcount support Fabio Estevam
2023-05-02 12:46   ` sbabic
2023-04-26 16:04 ` [PATCH v5 04/14] smegw01: Add altbootcmd Fabio Estevam
2023-05-02 12:47   ` sbabic
2023-04-26 16:04 ` Fabio Estevam [this message]
2023-05-02 12:47   ` [PATCH v5 05/14] smegw01: Run altbootcmd in the case of failure sbabic
2023-04-26 16:04 ` [PATCH v5 06/14] smegw01: Only commit to new partition if update was successful Fabio Estevam
2023-05-02 12:47   ` sbabic
2023-04-26 16:04 ` [PATCH v5 07/14] smegw01: Enable EMMC boot from multiple partitions Fabio Estevam
2023-05-02 12:47   ` sbabic
2023-04-26 16:04 ` [PATCH v5 08/14] smegw01: Change default boot device to eMMC Fabio Estevam
2023-05-02 12:46   ` sbabic
2023-04-26 16:04 ` [PATCH v5 09/14] smegw01: Switch to fitImage Fabio Estevam
2023-05-02 12:47   ` sbabic
2023-04-26 16:04 ` [PATCH v5 10/14] smegw01: Add lockdown U-Boot env support Fabio Estevam
2023-05-02 12:47   ` sbabic
2023-04-26 16:04 ` [PATCH v5 11/14] smegw01: Read the second MAC address Fabio Estevam
2023-05-02 12:46   ` sbabic
2023-04-26 16:04 ` [PATCH v5 12/14] smegw01: Disable additional boot menu options Fabio Estevam
2023-05-02 12:47   ` sbabic
2023-04-26 16:05 ` [PATCH v5 13/14] smegw01: Fix fallback to altbootcmd Fabio Estevam
2023-05-02 12:46   ` sbabic
2023-04-26 16:05 ` [PATCH v5 14/14] smegw01: Convert CFG_EXTRA_ENV_SETTINGS to an env file Fabio Estevam
2023-04-26 17:31   ` Tom Rini
2023-05-02 12:47   ` sbabic
2023-05-02 12:47 ` [PATCH v5 01/14] smegw01: Enable setting additional boot params sbabic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230426160501.1199085-5-festevam@gmail.com \
    --to=festevam@gmail.com \
    --cc=eduard@lionizers.com \
    --cc=festevam@denx.de \
    --cc=sbabic@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox