do_bootm: unify duplicate prototypes
The duplication of the do_bootm prototype has gotten out of hand, and they're pretty much all outdated (wrt constness). Unify them all in command.h. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
parent
40b484a3df
commit
36ebb78779
@ -35,7 +35,6 @@
|
||||
|
||||
#include "fwupdate.h"
|
||||
|
||||
extern int do_bootm(cmd_tbl_t *, int, int, char * const []);
|
||||
extern long do_fat_read(const char *, void *, unsigned long, int);
|
||||
extern int do_fat_fsload(cmd_tbl_t *, int, int, char * const []);
|
||||
|
||||
|
@ -29,7 +29,6 @@
|
||||
|
||||
#if defined(CONFIG_CMD_BSP)
|
||||
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
||||
extern int do_source (cmd_tbl_t *, int, int, char *[]);
|
||||
|
||||
#define ADDRMASK 0xfffff000
|
||||
|
@ -122,7 +122,6 @@ static char show_config_tab[][15] = {{"PCI0DLL_2 "}, /* 31 */
|
||||
|
||||
extern flash_info_t flash_info[];
|
||||
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
||||
extern int do_bootvx (cmd_tbl_t *, int, int, char *[]);
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
@ -34,8 +34,6 @@
|
||||
|
||||
#if defined(CONFIG_CMD_BSP)
|
||||
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
||||
|
||||
/*
|
||||
* Command loadpci: wait for signal from host and boot image.
|
||||
*/
|
||||
|
@ -31,8 +31,6 @@
|
||||
|
||||
#if defined(CONFIG_CMD_BSP)
|
||||
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
||||
|
||||
/*
|
||||
* Command led: controls the various LEDs 0..11 on the PN62 card.
|
||||
*/
|
||||
|
@ -826,7 +826,6 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
/* Check if we should attempt an auto-start */
|
||||
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
|
||||
char *local_args[2];
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
||||
|
||||
local_args[0] = argv[0];
|
||||
local_args[1] = NULL;
|
||||
|
@ -101,7 +101,6 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
/* Check if we should attempt an auto-start */
|
||||
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
|
||||
char *local_args[2];
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
||||
local_args[0] = argv[0];
|
||||
local_args[1] = NULL;
|
||||
printf ("Automatic boot of image at addr 0x%08lX ...\n", load_addr);
|
||||
|
@ -498,7 +498,6 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
/* Check if we should attempt an auto-start */
|
||||
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
|
||||
char *local_args[2];
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
||||
|
||||
local_args[0] = argv[0];
|
||||
local_args[1] = NULL;
|
||||
|
@ -789,7 +789,6 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
|
||||
/* Check if we should attempt an auto-start */
|
||||
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
|
||||
char *local_args[2];
|
||||
extern int do_bootm(cmd_tbl_t *, int, int, char *[]);
|
||||
|
||||
local_args[0] = cmd;
|
||||
local_args[1] = NULL;
|
||||
|
@ -28,8 +28,6 @@
|
||||
#include <command.h>
|
||||
#include <net.h>
|
||||
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char * const []);
|
||||
|
||||
static int netboot_common (proto_t, cmd_tbl_t *, int , char * const []);
|
||||
|
||||
int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
|
@ -329,7 +329,6 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
/* Check if we should attempt an auto-start */
|
||||
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
|
||||
char *local_args[2];
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
||||
local_args[0] = argv[0];
|
||||
local_args[1] = NULL;
|
||||
printf ("Automatic boot of image at addr 0x%08lX ...\n", addr);
|
||||
|
@ -490,7 +490,6 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
/* Check if we should attempt an auto-start */
|
||||
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
|
||||
char *local_args[2];
|
||||
extern int do_bootm(cmd_tbl_t *, int, int, char *[]);
|
||||
local_args[0] = argv[0];
|
||||
local_args[1] = NULL;
|
||||
printf("Automatic boot of image at addr 0x%08lX ...\n", addr);
|
||||
|
@ -95,6 +95,8 @@ 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
|
||||
|
||||
extern int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user