leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED

Browse Source 
At present we have two functions named __autoboot() which do different
things. This is confusing. Fix it by using if() instead of #ifdef for
selecting the functions, and renaming them to meaningful names.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-07-20 20:51:19 -06:00 committed by Tom Rini
parent 42b4d14e34
commit e79e4b250a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/autoboot.c
View File

@ -35,8 +35,6 @@ static int stored_bootdelay;
#define AUTOBOOT_STOP_STR_SHA256 "" #define AUTOBOOT_STOP_STR_SHA256 ""
#endif #endif
#if defined(CONFIG_AUTOBOOT_KEYED)
/* /*
* Use a "constant-length" time compare function for this * Use a "constant-length" time compare function for this
* hash compare: * hash compare:
@ -203,7 +201,7 @@ static int passwd_abort_key(uint64_t etime)
* Watch for 'delay' seconds for autoboot stop or autoboot delay string. * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
* returns: 0 - no key string, allow autoboot 1 - got key string, abort * returns: 0 - no key string, allow autoboot 1 - got key string, abort
*/ */
static int __abortboot(int bootdelay) static int abortboot_key_sequence(int bootdelay)
{ {
int abort; int abort;
uint64_t etime = endtick(bootdelay); uint64_t etime = endtick(bootdelay);
@ -226,13 +224,11 @@ static int __abortboot(int bootdelay)
return abort; return abort;
} }
# else /* !defined(CONFIG_AUTOBOOT_KEYED) */
#ifdef CONFIG_MENUKEY #ifdef CONFIG_MENUKEY
static int menukey; static int menukey;
#endif #endif
static int __abortboot(int bootdelay) static int abortboot_single_key(int bootdelay)
{ {
int abort = 0; int abort = 0;
unsigned long ts; unsigned long ts;
@ -277,14 +273,17 @@ static int __abortboot(int bootdelay)
return abort; return abort;
} }
# endif /* CONFIG_AUTOBOOT_KEYED */
static int abortboot(int bootdelay) static int abortboot(int bootdelay)
{ {
int abort = 0; int abort = 0;
if (bootdelay >= 0) if (bootdelay >= 0) {
abort = __abortboot(bootdelay); if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
abort = abortboot_key_sequence(bootdelay);
else
abort = abortboot_single_key(bootdelay);
}
if (IS_ENABLED(CONFIG_SILENT_CONSOLE) && abort) if (IS_ENABLED(CONFIG_SILENT_CONSOLE) && abort)
gd->flags &= ~GD_FLG_SILENT; gd->flags &= ~GD_FLG_SILENT;