dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-25 20:41:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

autoboot: rename abortboot_{keyed, normal} to __abortboot

Browse Source 
Because abortboot_keyed() and abortboot_normal() are not compiled
at the same time, we can rename both of them to __abortboot().
This allows to drop #ifdef from the caller.

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:02 +09:00
committed by Tom Rini
parent 2fbb8462b0
commit d8da8298ad
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/autoboot.c
View File

@@ -182,7 +182,7 @@ static int passwd_abort(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_keyed(int bootdelay) static int __abortboot(int bootdelay)
{ {
int abort; int abort;
uint64_t etime = endtick(bootdelay); uint64_t etime = endtick(bootdelay);
@@ -216,7 +216,7 @@ static int abortboot_keyed(int bootdelay)
static int menukey; static int menukey;
#endif #endif
static int abortboot_normal(int bootdelay) static int __abortboot(int bootdelay)
{ {
int abort = 0; int abort = 0;
unsigned long ts; unsigned long ts;
@@ -274,11 +274,7 @@ static int abortboot_normal(int bootdelay)
static int abortboot(int bootdelay) static int abortboot(int bootdelay)
{ {
#ifdef CONFIG_AUTOBOOT_KEYED return __abortboot(bootdelay);
return abortboot_keyed(bootdelay);
#else
return abortboot_normal(bootdelay);
#endif
} }
static void process_fdt_options(const void *blob) static void process_fdt_options(const void *blob)