Patchwork [U-Boot] do_bootd: unify duplicate prototypes

login
register
mail settings
Submitter Mike Frysinger
Date Oct. 20, 2010, 7:36 a.m.
Message ID <1287560186-31701-1-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/71892/
State Accepted
Commit 7842fb7c4f5be961c7aa9091dc8c760683b1377c
Delegated to: Wolfgang Denk
Headers show

Comments

Mike Frysinger - Oct. 20, 2010, 7:36 a.m.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 common/hush.c     |    4 ----
 common/main.c     |    2 --
 include/command.h |    3 +++
 3 files changed, 3 insertions(+), 6 deletions(-)
Wolfgang Denk - Nov. 28, 2010, 9:01 p.m.
Dear Mike Frysinger,

In message <1287560186-31701-1-git-send-email-vapier@gentoo.org> you wrote:
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  common/hush.c     |    4 ----
>  common/main.c     |    2 --
>  include/command.h |    3 +++
>  3 files changed, 3 insertions(+), 6 deletions(-)

Applied to "next" branch, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/common/hush.c b/common/hush.c
index 4dd9513..2482506 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -93,8 +93,6 @@ 
 #include <common.h>        /* readline */
 #include <hush.h>
 #include <command.h>        /* find_cmd */
-/*cmd_boot.c*/
-extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);      /* do_bootd */
 #endif
 #ifndef __U_BOOT__
 #include <ctype.h>     /* isalpha, isdigit */
@@ -1681,8 +1679,6 @@  static int run_pipe_real(struct pipe *pi)
 			} else {
 				int rcode;
 #if defined(CONFIG_CMD_BOOTD)
-	    extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
-
 				/* avoid "bootd" recursion */
 				if (cmdtp->cmd == do_bootd) {
 					if (flag & CMD_FLAG_BOOTD) {
diff --git a/common/main.c b/common/main.c
index d97ccd7..bbb208b 100644
--- a/common/main.c
+++ b/common/main.c
@@ -54,8 +54,6 @@  void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progre
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);		/* for do_reset() prototype */
 #endif
 
-extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
-
 #if defined(CONFIG_UPDATE_TFTP)
 void update_tftp (void);
 #endif /* CONFIG_UPDATE_TFTP */
diff --git a/include/command.h b/include/command.h
index 7cebf8a..72eab9d 100644
--- a/include/command.h
+++ b/include/command.h
@@ -95,6 +95,9 @@  extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *
 extern int cmd_get_data_size(char* arg, int default_size);
 #endif
 
+#ifdef CONFIG_CMD_BOOTD
+extern int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+#endif
 extern int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 
 #endif	/* __ASSEMBLY__ */