arm: mvebu: turris_{omnia, mox}: Reset bootdelay env for rescue
PATCH 1/1 arm: mvebu: turris_{omnia, mox}: Reset bootdelay env for rescue
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).
--- 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(-)
board/CZ.NIC/turris_mox/turris_mox.c +3 -2
@@ -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" );
board/CZ.NIC/turris_omnia/turris_omnia.c +3 -2
@@ -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" );
Signature · 1 line
2.20.1
Quoted 6 lines · On Sat, 27 Aug 2022 20:49:20 +0200 Pali Rohár <[email protected]> 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 <[email protected]>
Quoted 6 lines · Pali Rohár
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 <[email protected]>
Thanks,
Stefan
Quoted 45 lines
--- 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(-)board/CZ.NIC/turris_mox/turris_mox.c +3
-2@@ -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" );board/CZ.NIC/turris_omnia/turris_omnia.c +2
-1@@ -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" , };
board/CZ.NIC/turris_omnia/turris_omnia.c static void handle_reset_button(void) · line 565
Quoted 8 lines
board/CZ.NIC/turris_omnia/turris_omnia.c +1
-1@@ -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
Signature · 3 lines
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: [email protected]
Quoted 6 lines · Pali Rohár
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 <[email protected]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 45 lines
--- 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(-)board/CZ.NIC/turris_mox/turris_mox.c +3
-2@@ -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" );board/CZ.NIC/turris_omnia/turris_omnia.c +2
-1@@ -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" , };
board/CZ.NIC/turris_omnia/turris_omnia.c static void handle_reset_button(void) · line 565
Quoted 8 lines
board/CZ.NIC/turris_omnia/turris_omnia.c +1
-1@@ -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
Signature · 3 lines
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: [email protected]