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

Applied to u-boot-marvell/master

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