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 v2 05/13] smegw01: Run altbootcmd in the case of failure
Date: Fri, 21 Apr 2023 07:56:48 -0300 [thread overview]
Message-ID: <20230421105656.1062558-5-festevam@gmail.com> (raw)
In-Reply-To: <20230421105656.1062558-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 v1:
- 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 418151a6de..b3580d5d6e 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 6ee4acc70d..05edaac42f 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.38.1
next prev parent reply other threads:[~2023-04-21 10:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-21 10:56 [PATCH v2 01/13] smegw01: Enable setting additional boot params Fabio Estevam
2023-04-21 10:56 ` [PATCH v2 02/13] smegw01: Select CONFIG_CMD_SQUASHFS Fabio Estevam
2023-04-21 10:56 ` [PATCH v2 03/13] smegw01: Select bootcount support Fabio Estevam
2023-04-21 10:56 ` [PATCH v2 04/13] smegw01: Add altbootcmd Fabio Estevam
2023-04-21 10:56 ` Fabio Estevam [this message]
2023-04-21 10:56 ` [PATCH v2 06/13] smegw01: Only commit to new partition if update was successful Fabio Estevam
2023-04-21 10:56 ` [PATCH v2 7/7] smegw01: Enable EMMC boot from multiple partitions Fabio Estevam
2023-04-21 18:10 ` Pali Rohár
2023-04-24 11:09 ` Fabio Estevam
2023-04-21 10:56 ` [PATCH v2 08/13] smegw01: Change default boot device to eMMC Fabio Estevam
2023-04-21 10:56 ` [PATCH v2 09/13] smegw01: Switch to fitImage Fabio Estevam
2023-04-21 10:56 ` [PATCH v2 10/13] smegw01: Add lockdown U-Boot env support Fabio Estevam
2023-04-21 10:56 ` [PATCH v2 11/13] smegw01: Read the second MAC address Fabio Estevam
2023-04-21 10:56 ` [PATCH v2 12/13] smegw01: Disable additional boot menu options Fabio Estevam
2023-04-21 10:56 ` [PATCH 13/13] smegw01: Fix fallback to altbootcmd Fabio Estevam
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=20230421105656.1062558-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