From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 20 Oct 2010 07:36:26 +0000 (-0400)
Subject: do_bootd: unify duplicate prototypes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7842fb7c4f5be961c7aa9091dc8c760683b1377c;p=project%2Fbcm63xx%2Fu-boot.git

do_bootd: unify duplicate prototypes

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/common/hush.c b/common/hush.c
index 2188fd4ac8..0f101bff1c 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 d97ccd7dd8..bbb208b927 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 915be57987..e98332e121 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__ */