From: Stefan Roese <sr@denx.de>
To: "Pali Rohár" <pali@kernel.org>, "Marek Behún" <kabel@kernel.org>
Cc: u-boot@lists.denx.de
Subject: Re: [PATCH] arm: mvebu: turris_{omnia, mox}: Reset bootdelay env for rescue
Date: Tue, 30 Aug 2022 14:26:52 +0200 [thread overview]
Message-ID: <46689f66-b71b-8ef9-19c5-ecd14997af85@denx.de> (raw)
In-Reply-To: <20220827184920.4313-1-pali@kernel.org>
On 27.08.22 20:49, Pali Rohár wrote:
> When rescue mode was activated reset also bootdelay env variable to its
> default value. This will ensure that reset button works and starts rescue
> mode also in the case when user changed bootdelay env variable to -1 (which
> has meaning to not start autoboot).
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> board/CZ.NIC/turris_mox/turris_mox.c | 5 +++--
> board/CZ.NIC/turris_omnia/turris_omnia.c | 5 +++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
> index 3dbd68e52366..5e1cf328ecc1 100644
> --- a/board/CZ.NIC/turris_mox/turris_mox.c
> +++ b/board/CZ.NIC/turris_mox/turris_mox.c
> @@ -440,8 +440,9 @@ static void handle_reset_button(void)
> env_set_default_vars(1, (char * const *)vars, 0);
>
> if (read_reset_button()) {
> - const char * const vars[2] = {
> + const char * const vars[3] = {
> "bootcmd",
> + "bootdelay",
> "distro_bootcmd",
> };
>
> @@ -449,7 +450,7 @@ static void handle_reset_button(void)
> * Set the above envs to their default values, in case the user
> * managed to break them.
> */
> - env_set_default_vars(2, (char * const *)vars, 0);
> + env_set_default_vars(3, (char * const *)vars, 0);
>
> /* Ensure bootcmd_rescue is used by distroboot */
> env_set("boot_targets", "rescue");
> diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
> index cf8a6026702b..a7f96e5b7739 100644
> --- a/board/CZ.NIC/turris_omnia/turris_omnia.c
> +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
> @@ -549,8 +549,9 @@ static void handle_reset_button(void)
> env_set_ulong("omnia_reset", reset_status);
>
> if (reset_status) {
> - const char * const vars[2] = {
> + const char * const vars[3] = {
> "bootcmd",
> + "bootdelay",
> "distro_bootcmd",
> };
>
> @@ -558,7 +559,7 @@ static void handle_reset_button(void)
> * Set the above envs to their default values, in case the user
> * managed to break them.
> */
> - env_set_default_vars(2, (char * const *)vars, 0);
> + env_set_default_vars(3, (char * const *)vars, 0);
>
> /* Ensure bootcmd_rescue is used by distroboot */
> env_set("boot_targets", "rescue");
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
next prev parent reply other threads:[~2022-08-30 12:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-27 18:49 [PATCH] arm: mvebu: turris_{omnia, mox}: Reset bootdelay env for rescue Pali Rohár
2022-08-28 3:48 ` Marek Behún
2022-08-30 12:26 ` Stefan Roese [this message]
2022-09-13 6:59 ` Stefan Roese
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=46689f66-b71b-8ef9-19c5-ecd14997af85@denx.de \
--to=sr@denx.de \
--cc=kabel@kernel.org \
--cc=pali@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).