]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm/km/mgcoge3un: enhance "waitforne" feature
authorHolger Brunck <holger.brunck@keymile.com>
Tue, 27 Sep 2011 02:54:31 +0000 (02:54 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 3 Nov 2011 21:56:22 +0000 (22:56 +0100)
The mgcoge3un waits to be released from mgcoge3ne at startup.
This patch enhances this feature with the possibility to interrupt
this wait if a key is pressed.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>

board/keymile/km_arm/km_arm.c

index 6ef5e5da12c42f1f3b174219664c75dadcf6e930..6e32249db978414d29f21f11ec77715cbe934ca3 100644 (file)
@@ -207,8 +207,14 @@ int misc_init_r(void)
        if (wait_for_ne != NULL) {
                if (strcmp(wait_for_ne, "true") == 0) {
                        int cnt = 0;
+                       int abort = 0;
                        puts("NE go: ");
                        while (startup_allowed() == 0) {
+                               if (tstc()) {
+                                       (void) getc(); /* consume input */
+                                       abort = 1;
+                                       break;
+                               }
                                udelay(200000);
                                cnt++;
                                if (cnt == 5)
@@ -218,7 +224,10 @@ int misc_init_r(void)
                                        puts("    \b\b\b\b");
                                }
                        }
-                       puts("OK\n");
+                       if (abort == 1)
+                               printf("\nAbort waiting for ne\n");
+                       else
+                               puts("OK\n");
                }
        }
 #endif