diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-27 16:23:02 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-01 17:42:55 -0400 |
| commit | d8da8298ad9b5a379d6fb7f079a3a1a591147a5e (patch) | |
| tree | d2417083fc5ee55acd633459db7ba128be4ad9db /common | |
| parent | 2fbb8462b0e18893b4b739705db047ffda82d4fc (diff) | |
autoboot: rename abortboot_{keyed, normal} to __abortboot
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 35deece7f7..eb31c8875d 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -182,7 +182,7 @@ static int passwd_abort(uint64_t etime) * Watch for 'delay' seconds for autoboot stop or autoboot delay string. * 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; uint64_t etime = endtick(bootdelay); @@ -216,7 +216,7 @@ static int abortboot_keyed(int bootdelay) static int menukey; #endif -static int abortboot_normal(int bootdelay) +static int __abortboot(int bootdelay) { int abort = 0; unsigned long ts; @@ -274,11 +274,7 @@ static int abortboot_normal(int bootdelay) static int abortboot(int bootdelay) { -#ifdef CONFIG_AUTOBOOT_KEYED - return abortboot_keyed(bootdelay); -#else - return abortboot_normal(bootdelay); -#endif + return __abortboot(bootdelay); } static void process_fdt_options(const void *blob) |