V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

autoboot: move bootdelay >= 0 check to abortboot() 

Move the bootdelay >= 0 check to the caller, which simplifies
the callees.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Masahiro Yamada 2016-06-27 16:23:04 +09:00 committed by Tom Rini
parent 09b9d9e55f
commit 4632739202
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/autoboot.c
View File

@ -187,9 +187,6 @@ static int __abortboot(int bootdelay)
int abort; int abort;
uint64_t etime = endtick(bootdelay); uint64_t etime = endtick(bootdelay);
if (bootdelay < 0)
return 0;
# ifdef CONFIG_AUTOBOOT_PROMPT # ifdef CONFIG_AUTOBOOT_PROMPT
/* /*
* CONFIG_AUTOBOOT_PROMPT includes the %d for all boards. * CONFIG_AUTOBOOT_PROMPT includes the %d for all boards.
@ -219,20 +216,16 @@ static int __abortboot(int bootdelay)
#ifdef CONFIG_MENUPROMPT #ifdef CONFIG_MENUPROMPT
printf(CONFIG_MENUPROMPT); printf(CONFIG_MENUPROMPT);
#else #else
if (bootdelay >= 0) printf("Hit any key to stop autoboot: %2d ", bootdelay);
printf("Hit any key to stop autoboot: %2d ", bootdelay);
#endif #endif
/* /*
* Check if key already pressed * Check if key already pressed
* Don't check if bootdelay < 0
*/ */
if (bootdelay >= 0) { if (tstc()) { /* we got a key press */
if (tstc()) { /* we got a key press */ (void) getc(); /* consume input */
(void) getc(); /* consume input */ puts("\b\b\b 0");
puts("\b\b\b 0"); abort = 1; /* don't auto boot */
abort = 1; /* don't auto boot */
}
} }
while ((bootdelay > 0) && (!abort)) { while ((bootdelay > 0) && (!abort)) {
@ -264,9 +257,10 @@ static int __abortboot(int bootdelay)
static int abortboot(int bootdelay) static int abortboot(int bootdelay)
{ {
int abort; int abort = 0;
abort = __abortboot(bootdelay); if (bootdelay >= 0)
abort = __abortboot(bootdelay);
#ifdef CONFIG_SILENT_CONSOLE #ifdef CONFIG_SILENT_CONSOLE
if (abort) if (abort)