diff mbox

[U-Boot,v2,4/7] ac14xx: re-order the recovery condition checks

Message ID 1370436671-12422-5-git-send-email-gsi@denx.de
State Accepted
Delegated to: Wolfgang Denk
Headers show

Commit Message

Gerhard Sittig June 5, 2013, 12:51 p.m. UTC 
re-order the conditions which make the recovery system startup: combine
those conditions which were explicitly initiated (key press, software
request) and those which post-process error conditions (installer issues)

Signed-off-by: Gerhard Sittig <gsi@denx.de>
---
 board/ifm/ac14xx/ac14xx.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Wolfgang Denk June 24, 2013, 8:27 p.m. UTC | #1 
Dear Gerhard Sittig,

In message <1370436671-12422-5-git-send-email-gsi@denx.de> you wrote:
> re-order the conditions which make the recovery system startup: combine
> those conditions which were explicitly initiated (key press, software
> request) and those which post-process error conditions (installer issues)
> 
> Signed-off-by: Gerhard Sittig <gsi@denx.de>
> ---
>  board/ifm/ac14xx/ac14xx.c |   12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Applied to u-boot-mpc5xxx, thanks.


Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/board/ifm/ac14xx/ac14xx.c b/board/ifm/ac14xx/ac14xx.c
index c8e88cc..dc2aff0 100644
--- a/board/ifm/ac14xx/ac14xx.c
+++ b/board/ifm/ac14xx/ac14xx.c
@@ -336,8 +336,8 @@  int misc_init_r(void)
 	/*
 	 * enforce the start of the recovery system when
 	 * - the appropriate keys were pressed
-	 * - a previous installation was aborted or has failed
 	 * - "some" external software told us to
+	 * - a previous installation was aborted or has failed
 	 */
 	want_recovery = 0;
 	keys = gpio_querykbd();
@@ -347,6 +347,11 @@  int misc_init_r(void)
 		printf("detected recovery request (keyboard)\n");
 		want_recovery = 1;
 	}
+	s = getenv("want_recovery");
+	if ((s != NULL) && (*s != '\0')) {
+		printf("detected recovery request (environment)\n");
+		want_recovery = 1;
+	}
 	s = getenv("install_in_progress");
 	if ((s != NULL) && (*s != '\0')) {
 		printf("previous installation has not completed\n");
@@ -357,11 +362,6 @@  int misc_init_r(void)
 		printf("previous installation has failed\n");
 		want_recovery = 1;
 	}
-	s = getenv("want_recovery");
-	if ((s != NULL) && (*s != '\0')) {
-		printf("detected recovery request (environment)\n");
-		want_recovery = 1;
-	}
 	if (want_recovery) {
 		printf("enforced start of the recovery system\n");
 		setenv("bootcmd", "run recovery");