| 1234567891011121314151617181920212223242526272829303132333435363738394041424344 |
- --- uboot-2013.10_orig/common/main.c 2013-10-16 19:08:12.000000000 +0200
- +++ uboot-2013.10/common/main.c 2015-10-08 15:45:37.315543700 +0200
- @@ -194,7 +194,7 @@ static int abortboot_normal(int bootdela
- printf(CONFIG_MENUPROMPT);
- #else
- if (bootdelay >= 0)
- - printf("Hit any key to stop autoboot: %2d ", bootdelay);
- + printf("Hit ENTER key to stop autoboot: %2d ", bootdelay);
- #endif
-
- #if defined CONFIG_ZERO_BOOTDELAY_CHECK
- @@ -204,9 +204,10 @@ static int abortboot_normal(int bootdela
- */
- if (bootdelay >= 0) {
- if (tstc()) { /* we got a key press */
- - (void) getc(); /* consume input */
- + int in = getc(); /* consume input */
- puts ("\b\b\b 0");
- - abort = 1; /* don't auto boot */
- + if (in == 13)
- + abort = 1; /* don't auto boot */
- }
- }
- #endif
- @@ -217,12 +218,14 @@ static int abortboot_normal(int bootdela
- ts = get_timer(0);
- do {
- if (tstc()) { /* we got a key press */
- - abort = 1; /* don't auto boot */
- - bootdelay = 0; /* no more delay */
- + int in = getc(); /* consume input */
- +
- + if (in == 13) {
- + abort = 1; /* don't auto boot */
- + bootdelay = 0; /* no more delay */
- + }
- # ifdef CONFIG_MENUKEY
- - menukey = getc();
- -# else
- - (void) getc(); /* consume input */
- + menukey = in;
- # endif
- break;
- }
|
