do_bootd: unify duplicate prototypes
PATCH 1/1 do_bootd: unify duplicate prototypes
Signed-off-by Mike Frysinger <[email protected]>
--- common/hush.c | 4 ---- common/main.c | 2 -- include/command.h | 3 +++ 3 files changed, 3 insertions(+), 6 deletions(-)
common/hush.c +0 -4
@@ -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 ) {
common/main.c +0 -2
@@ -54,8 +54,6 @@ void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progreextern 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 */
include/command.h +3 -0
@@ -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__ */
Signature · 1 line
1.7.3.1
Wolfgang Denk
AppliedPATCH 1/1 do_bootd: unify duplicate prototypes
Dear Mike Frysinger,
Quoted 6 lines · In message <[email protected]> you wrote:
Signed-off-by Mike Frysinger <[email protected]>--- 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
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de We are Microsoft. Unix is irrelevant. Openness is futile. Prepare to be assimilated.