Patchwork [U-Boot,v4,3/9] main: Separate out the two abortboot() functions

login
register
mail settings
Submitter Simon Glass
Date May 15, 2013, 4:23 p.m.
Message ID <1368635041-27638-3-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/244133/
State Accepted, archived
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - May 15, 2013, 4:23 p.m.
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>

---
Changes in v4:
- Create a patch that moves the code but still uses #ifdef

Changes in v3:
- Fix commit message which said autoboot() instead of abortboot()
- Add note about CONFIG_MENU not being needed in main.c anymore

 common/main.c    | 19 +++++++++++--------
 include/common.h |  3 ---
 2 files changed, 11 insertions(+), 11 deletions(-)
Joe Hershberger - May 15, 2013, 4:37 p.m.
On Wed, May 15, 2013 at 11:23 AM, Simon Glass <sjg@chromium.org> wrote:
> 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>

Patch

diff --git a/common/main.c b/common/main.c
index 9890184..22ea8fd 100644
--- a/common/main.c
+++ b/common/main.c
@@ -89,10 +89,7 @@  extern void mdm_init(void); /* defined in board.c */
  */
 #if defined(CONFIG_BOOTDELAY)
 # if defined(CONFIG_AUTOBOOT_KEYED)
-#ifndef CONFIG_MENU
-static inline
-#endif
-int abortboot(int bootdelay)
+static int abortboot_keyed(int bootdelay)
 {
 	int abort = 0;
 	uint64_t etime = endtick(bootdelay);
@@ -211,10 +208,7 @@  int abortboot(int bootdelay)
 static int menukey = 0;
 #endif
 
-#ifndef CONFIG_MENU
-static inline
-#endif
-int abortboot(int bootdelay)
+static int abortboot_normal(int bootdelay)
 {
 	int abort = 0;
 	unsigned long ts;
@@ -271,6 +265,15 @@  int abortboot(int bootdelay)
 	return abort;
 }
 # 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 */
 
 /*
diff --git a/include/common.h b/include/common.h
index e682bd8..126891d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -310,9 +310,6 @@  int	readline_into_buffer(const char *const prompt, char *buffer,
 int	parse_line (char *, char *[]);
 void	init_cmd_timeout(void);
 void	reset_cmd_timeout(void);
-#ifdef CONFIG_MENU
-int	abortboot(int bootdelay);
-#endif
 extern char console_buffer[];
 
 /* arch/$(ARCH)/lib/board.c */