diff options
| author | Simon Glass <sjg@chromium.org> | 2013-05-15 06:23:55 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-04 16:06:31 -0400 |
| commit | 063ae006aedf1f828d8e23177eb8e049ce4fe968 (patch) | |
| tree | 2a6dc25f96c67b37b096e29714e675f0ec61dda9 /include | |
| parent | ea5427e2607041f6f5cf0bff8f5c85bc7f67dbf8 (diff) | |
| download | u-boot-imx-063ae006aedf1f828d8e23177eb8e049ce4fe968.zip u-boot-imx-063ae006aedf1f828d8e23177eb8e049ce4fe968.tar.gz u-boot-imx-063ae006aedf1f828d8e23177eb8e049ce4fe968.tar.bz2 | |
main: Separate out the two abortboot() functions
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 3 |
1 files changed, 0 insertions, 3 deletions
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 */ |