Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

main: Separate out the two abortboot() functions

Browse source 
There are two implementations of abortboot(). Turn these into two separate
functions, and create a single abortboot() which calls either one or the
other.

Also it seems that nothing uses abortboot() outside main, so make it static.

At this point there is no further use of CONFIG_MENU in main.c.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Simon Glass 2013-05-15 06:23:55 +00:00 committed by Tom Rini
parent ea5427e260
commit 063ae006ae
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/main.c
View file

@ -89,10 +89,7 @@ extern void mdm_init(void); /* defined in board.c */
*/ */
#if defined(CONFIG_BOOTDELAY) #if defined(CONFIG_BOOTDELAY)
# if defined(CONFIG_AUTOBOOT_KEYED) # if defined(CONFIG_AUTOBOOT_KEYED)
#ifndef CONFIG_MENU static int abortboot_keyed(int bootdelay)
static inline
#endif
int abortboot(int bootdelay)
{ {
int abort = 0; int abort = 0;
uint64_t etime = endtick(bootdelay); uint64_t etime = endtick(bootdelay);
@ -211,10 +208,7 @@ int abortboot(int bootdelay)
static int menukey = 0; static int menukey = 0;
#endif #endif
#ifndef CONFIG_MENU static int abortboot_normal(int bootdelay)
static inline
#endif
int abortboot(int bootdelay)
{ {
int abort = 0; int abort = 0;
unsigned long ts; unsigned long ts;
@ -271,6 +265,15 @@ int abortboot(int bootdelay)
return abort; return abort;
} }
# endif /* CONFIG_AUTOBOOT_KEYED */ # endif /* CONFIG_AUTOBOOT_KEYED */
static int abortboot(int bootdelay)
{
#ifdef CONFIG_AUTOBOOT_KEYED
return abortboot_keyed(bootdelay);
#else
return abortboot_normal(bootdelay);
#endif
}
#endif /* CONFIG_BOOTDELAY */ #endif /* CONFIG_BOOTDELAY */
/* /*

3
include/common.h
View file

@ -310,9 +310,6 @@ int readline_into_buffer(const char *const prompt, char *buffer,
int parse_line (char *, char *[]); int parse_line (char *, char *[]);
void init_cmd_timeout(void); void init_cmd_timeout(void);
void reset_cmd_timeout(void); void reset_cmd_timeout(void);
#ifdef CONFIG_MENU
int abortboot(int bootdelay);
#endif
extern char console_buffer[]; extern char console_buffer[];
/* arch/$(ARCH)/lib/board.c */ /* arch/$(ARCH)/lib/board.c */