remove u-boot command paramter flag
This commit is contained in:
parent
b0615cc909
commit
3cbc5c5c12
|
@ -317,7 +317,7 @@ void unmap_image(struct image_handle *handle)
|
|||
#define OPT_OFTREE
|
||||
#endif
|
||||
|
||||
int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_bootm (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
ulong iflag;
|
||||
int verify = 1;
|
||||
|
@ -420,38 +420,38 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
break;
|
||||
#ifdef CONFIG_NETBSD
|
||||
case IH_OS_NETBSD:
|
||||
do_bootm_netbsd (cmdtp, flag, argc, argv,
|
||||
do_bootm_netbsd (cmdtp, argc, argv,
|
||||
addr, len_ptr, verify);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LYNXKDI
|
||||
case IH_OS_LYNXOS:
|
||||
do_bootm_lynxkdi (cmdtp, flag, argc, argv,
|
||||
do_bootm_lynxkdi (cmdtp, argc, argv,
|
||||
addr, len_ptr, verify);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_RTEMS
|
||||
case IH_OS_RTEMS:
|
||||
do_bootm_rtems (cmdtp, flag, argc, argv,
|
||||
do_bootm_rtems (cmdtp, argc, argv,
|
||||
addr, len_ptr, verify);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_ELF)
|
||||
case IH_OS_VXWORKS:
|
||||
do_bootm_vxworks (cmdtp, flag, argc, argv,
|
||||
do_bootm_vxworks (cmdtp, argc, argv,
|
||||
addr, len_ptr, verify);
|
||||
break;
|
||||
case IH_OS_QNX:
|
||||
do_bootm_qnxelf (cmdtp, flag, argc, argv,
|
||||
do_bootm_qnxelf (cmdtp, argc, argv,
|
||||
addr, len_ptr, verify);
|
||||
break;
|
||||
#endif /* CFG_CMD_ELF */
|
||||
#ifdef CONFIG_ARTOS
|
||||
case IH_OS_ARTOS:
|
||||
do_bootm_artos (cmdtp, flag, argc, argv,
|
||||
do_bootm_artos (cmdtp, argc, argv,
|
||||
addr, len_ptr, verify);
|
||||
break;
|
||||
#endif
|
||||
|
@ -460,7 +460,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
SHOW_BOOT_PROGRESS (-9);
|
||||
#ifdef DEBUG
|
||||
puts ("\n## Control returned to monitor - resetting...\n");
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
do_reset (cmdtp, argc, argv);
|
||||
#endif
|
||||
|
||||
err_out:
|
||||
|
@ -491,7 +491,7 @@ U_BOOT_CMD_END
|
|||
|
||||
#ifdef CONFIG_NETBSD
|
||||
static void
|
||||
do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
|
||||
do_bootm_netbsd (cmd_tbl_t *cmdtp,
|
||||
int argc, char *argv[],
|
||||
ulong addr,
|
||||
ulong *len_ptr,
|
||||
|
@ -580,7 +580,7 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
|
|||
extern uchar (*env_get_char)(int);
|
||||
|
||||
static void
|
||||
do_bootm_artos (cmd_tbl_t *cmdtp, int flag,
|
||||
do_bootm_artos (cmd_tbl_t *cmdtp,
|
||||
int argc, char *argv[],
|
||||
ulong addr,
|
||||
ulong *len_ptr,
|
||||
|
@ -666,7 +666,7 @@ do_bootm_artos (cmd_tbl_t *cmdtp, int flag,
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_IMI
|
||||
int do_iminfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_iminfo ( cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int arg;
|
||||
ulong addr;
|
||||
|
@ -782,7 +782,7 @@ void bz_internal_error(int errcode)
|
|||
|
||||
#ifdef CONFIG_RTEMS
|
||||
static void
|
||||
do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
||||
do_bootm_rtems (cmd_tbl_t *cmdtp, int argc, char *argv[],
|
||||
ulong addr, ulong *len_ptr, int verify)
|
||||
{
|
||||
#if 0
|
||||
|
@ -810,7 +810,7 @@ do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_ELF)
|
||||
static void
|
||||
do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
||||
do_bootm_vxworks (cmd_tbl_t *cmdtp, int argc, char *argv[],
|
||||
ulong addr, ulong *len_ptr, int verify)
|
||||
{
|
||||
image_header_t *hdr = &header;
|
||||
|
@ -818,11 +818,11 @@ do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
sprintf(str, "%x", ntohl(hdr->ih_ep)); /* write entry-point into string */
|
||||
setenv("loadaddr", str);
|
||||
do_bootvx(cmdtp, 0, 0, NULL);
|
||||
do_bootvx(cmdtp, 0, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
do_bootm_qnxelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
||||
do_bootm_qnxelf (cmd_tbl_t *cmdtp, int argc, char *argv[],
|
||||
ulong addr, ulong *len_ptr, int verify)
|
||||
{
|
||||
image_header_t *hdr = &header;
|
||||
|
@ -832,13 +832,13 @@ do_bootm_qnxelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
sprintf(str, "%x", ntohl(hdr->ih_ep)); /* write entry-point into string */
|
||||
local_args[0] = argv[0];
|
||||
local_args[1] = str; /* and provide it via the arguments */
|
||||
do_bootelf(cmdtp, 0, 2, local_args);
|
||||
do_bootelf(cmdtp, 2, local_args);
|
||||
}
|
||||
#endif /* CFG_CMD_ELF */
|
||||
|
||||
#ifdef CONFIG_LYNXKDI
|
||||
static void
|
||||
do_bootm_lynxkdi (cmd_tbl_t *cmdtp, int flag,
|
||||
do_bootm_lynxkdi (cmd_tbl_t *cmdtp,
|
||||
int argc, char *argv[],
|
||||
ulong addr,
|
||||
ulong *len_ptr,
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <xfuncs.h>
|
||||
#include <malloc.h>
|
||||
|
||||
static int do_cat(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_cat(cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int ret;
|
||||
int fd, i;
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <fs.h>
|
||||
#include <errno.h>
|
||||
|
||||
static int do_cd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_cd (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <command.h>
|
||||
#include <readkey.h>
|
||||
|
||||
int do_clear (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_clear (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
printf(ANSI_CLEAR_SCREEN);
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#define RW_BUF_SIZE (ulong)4096
|
||||
|
||||
int do_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_cp ( cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int r, w, ret = 1;
|
||||
int src = 0, dst = 0;
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <malloc.h>
|
||||
#include <linux/ctype.h>
|
||||
|
||||
int do_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_crc (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
ulong start = 0, size = ~0, total = 0, now;
|
||||
ulong crc = 0, vcrc = 0;
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
|
||||
static int do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_echo (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int i, optind = 1;
|
||||
int fd = stdout, opt, newline = 1;
|
||||
|
|
|
@ -372,7 +372,7 @@ static void getwinsize(void) {
|
|||
}
|
||||
#endif
|
||||
|
||||
int do_edit(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||
int do_edit(cmd_tbl_t * cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int lastscrcol;
|
||||
int i;
|
||||
|
|
|
@ -117,7 +117,7 @@ out:
|
|||
}
|
||||
|
||||
#ifdef __U_BOOT__
|
||||
int do_saveenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_saveenv(cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int ret, fd;
|
||||
char *filename, *dirname;
|
||||
|
@ -277,7 +277,7 @@ out:
|
|||
}
|
||||
|
||||
#ifdef __U_BOOT__
|
||||
int do_loadenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_loadenv(cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
char *filename, *dirname;
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <malloc.h>
|
||||
#include <xfuncs.h>
|
||||
|
||||
static int do_exec(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_exec(cmd_tbl_t * cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int i;
|
||||
char *script;
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <linux/stat.h>
|
||||
|
||||
int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_flerase (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int fd;
|
||||
char *filename = NULL;
|
||||
|
@ -90,7 +90,7 @@ U_BOOT_CMD_START(erase)
|
|||
U_BOOT_CMD_HELP(cmd_erase_help)
|
||||
U_BOOT_CMD_END
|
||||
|
||||
int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_protect (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int fd;
|
||||
char *filename = NULL;
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <common.h>
|
||||
#include <command.h>
|
||||
|
||||
int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_go (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
ulong addr, rc;
|
||||
int rcode = 0;
|
||||
|
|
|
@ -63,7 +63,7 @@ int his_pad_count; /* number of pad chars he needs */
|
|||
char his_pad_char; /* pad chars he needs */
|
||||
char his_quote; /* quote chars he'll use */
|
||||
|
||||
int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_load_serial_bin (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
ulong offset = 0;
|
||||
ulong addr;
|
||||
|
|
|
@ -42,7 +42,7 @@ static int save_serial (ulong offset, ulong size);
|
|||
static int write_record (char *buf);
|
||||
# endif /* CFG_CMD_SAVES */
|
||||
|
||||
int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_load_serial (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
ulong offset = 0;
|
||||
ulong addr;
|
||||
|
|
|
@ -95,7 +95,7 @@ out:
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int do_ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_ls (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int ret, opt;
|
||||
ulong flags = 0;
|
||||
|
|
|
@ -103,7 +103,7 @@ int memory_display(char *addr, ulong offs, ulong nbytes, int size)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_mem_md ( cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
ulong start = 0, size = 0x100;
|
||||
int r, now;
|
||||
|
@ -202,7 +202,7 @@ U_BOOT_CMD_START(md)
|
|||
U_BOOT_CMD_HELP(cmd_md_help)
|
||||
U_BOOT_CMD_END
|
||||
|
||||
int do_mem_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_mem_mw ( cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int ret = 0;
|
||||
int fd;
|
||||
|
@ -297,7 +297,7 @@ U_BOOT_CMD_START(mw)
|
|||
U_BOOT_CMD_END
|
||||
|
||||
#if 0
|
||||
int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_mem_cmp (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
ulong addr1, addr2, count, ngood;
|
||||
int size;
|
||||
|
@ -376,7 +376,7 @@ U_BOOT_CMD_END
|
|||
#endif
|
||||
|
||||
#if 0
|
||||
int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_mem_cp ( cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
ulong count, offset, now;
|
||||
int ret;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <command.h>
|
||||
#include <malloc.h>
|
||||
|
||||
int do_meminfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_meminfo (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
malloc_stats();
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
* interrupted by ctrl-c or by a failure of one of the sub-tests.
|
||||
*/
|
||||
|
||||
int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_mem_mtest (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
vu_long *addr, *start, *end;
|
||||
ulong val;
|
||||
|
|
|
@ -47,7 +47,7 @@ uint last_reg;
|
|||
* mii read {addr} {reg}
|
||||
* mii write {addr} {reg} {data}
|
||||
*/
|
||||
int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||
int do_mii (cmd_tbl_t * cmdtp, int argc, char *argv[])
|
||||
{
|
||||
char op;
|
||||
unsigned char addr, reg;
|
||||
|
@ -427,7 +427,7 @@ static void extract_range(
|
|||
}
|
||||
|
||||
/* ---------------------------------------------------------------- */
|
||||
int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||
int do_mii (cmd_tbl_t * cmdtp, int argc, char *argv[])
|
||||
{
|
||||
char op[2];
|
||||
unsigned char addrlo, addrhi, reglo, reghi;
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <fs.h>
|
||||
#include <errno.h>
|
||||
|
||||
static int do_mkdir (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_mkdir (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int i = 1;
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <fs.h>
|
||||
#include <errno.h>
|
||||
|
||||
static int do_mount (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_mount (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int ret = 0;
|
||||
struct mtab_entry *entry = NULL;
|
||||
|
|
|
@ -88,7 +88,7 @@ static void netboot_update_env (void)
|
|||
#endif
|
||||
}
|
||||
|
||||
int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_bootp (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
return netboot_common (BOOTP, cmdtp, argc, argv);
|
||||
}
|
||||
|
@ -100,7 +100,7 @@ U_BOOT_CMD_START(bootp)
|
|||
U_BOOT_CMD_HELP("[loadAddress] [bootfilename]\n")
|
||||
U_BOOT_CMD_END
|
||||
|
||||
int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_tftpb (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
return netboot_common (TFTP, cmdtp, argc, argv);
|
||||
}
|
||||
|
@ -116,7 +116,7 @@ U_BOOT_CMD_START(tftpboot)
|
|||
U_BOOT_CMD_HELP(cmd_tftpboot_help)
|
||||
U_BOOT_CMD_END
|
||||
|
||||
int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_rarpb (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
return netboot_common (RARP, cmdtp, argc, argv);
|
||||
}
|
||||
|
@ -129,7 +129,7 @@ U_BOOT_CMD_START(rarpboot)
|
|||
U_BOOT_CMD_END
|
||||
|
||||
#ifdef CONFIG_NET_DHCP
|
||||
int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_dhcp (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int size;
|
||||
|
||||
|
@ -151,7 +151,7 @@ U_BOOT_CMD_END
|
|||
#endif /* CONFIG_NET_DHCP */
|
||||
|
||||
#ifdef CONFIG_NET_NFS
|
||||
int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_nfs (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
return netboot_common(NFS, cmdtp, argc, argv);
|
||||
}
|
||||
|
@ -221,7 +221,7 @@ static void cdp_update_env(void)
|
|||
|
||||
}
|
||||
|
||||
int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_cdp (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int r;
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@ static int mtd_part_do_parse_one(struct partition *part, const char *str,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int do_addpart(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||
int do_addpart(cmd_tbl_t * cmdtp, int argc, char *argv[])
|
||||
{
|
||||
struct partition *part;
|
||||
struct device_d *dev;
|
||||
|
@ -181,7 +181,7 @@ U_BOOT_CMD_START(addpart)
|
|||
U_BOOT_CMD_HELP(cmd_addpart_help)
|
||||
U_BOOT_CMD_END
|
||||
|
||||
int do_delpart(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||
int do_delpart(cmd_tbl_t * cmdtp, int argc, char *argv[])
|
||||
{
|
||||
struct device_d *dev;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <command.h>
|
||||
#include <fs.h>
|
||||
|
||||
static int do_pwd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_pwd (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
printf("%s\n", getcwd());
|
||||
return 0;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <common.h>
|
||||
#include <command.h>
|
||||
|
||||
int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_reginfo (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
reginfo();
|
||||
return 0;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <common.h>
|
||||
#include <command.h>
|
||||
|
||||
static int cmd_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int cmd_reset (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
reset_cpu(0);
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <fs.h>
|
||||
#include <errno.h>
|
||||
|
||||
static int do_rm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_rm (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int i = 1;
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#include <fs.h>
|
||||
#include <errno.h>
|
||||
|
||||
static int do_rmdir (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_rmdir (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int i = 1;
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <command.h>
|
||||
#include <clock.h>
|
||||
|
||||
int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_sleep (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
uint64_t start;
|
||||
ulong delay;
|
||||
|
|
|
@ -39,7 +39,7 @@ int splash_set_fb_data(struct fb_data *d)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int do_splash(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_splash(cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
ulong addr;
|
||||
bmp_image_t *bmp;
|
||||
|
|
|
@ -77,7 +77,7 @@ static int parse_opt(const char *opt)
|
|||
}
|
||||
|
||||
int
|
||||
do_test (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
do_test (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
char **ap;
|
||||
int left, adv, expr, last_expr, neg, last_cmp, opt, zero;
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#define TIMEOUT_ANYKEY (1 << 2)
|
||||
#define TIMEOUT_SILENT (1 << 3)
|
||||
|
||||
static int do_timeout(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_timeout(cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int timeout = 3, ret = 1;
|
||||
int flags = 0, opt, countdown;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <fs.h>
|
||||
#include <errno.h>
|
||||
|
||||
static int do_umount (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_umount (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <environment.h>
|
||||
|
||||
int
|
||||
do_version (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
do_version (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
extern char version_string[];
|
||||
printf ("\n%s\n", version_string);
|
||||
|
@ -46,7 +46,7 @@ U_BOOT_CMD_START(version)
|
|||
U_BOOT_CMD_END
|
||||
|
||||
int
|
||||
do_true (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
do_true (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ U_BOOT_CMD_START(true)
|
|||
U_BOOT_CMD_END
|
||||
|
||||
int
|
||||
do_false (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
do_false (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
@ -72,7 +72,7 @@ U_BOOT_CMD_END
|
|||
#ifdef CONFIG_SHELL_HUSH
|
||||
|
||||
int
|
||||
do_readline (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
do_readline (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
char *buf = xzalloc(CONFIG_CBSIZE);
|
||||
|
||||
|
@ -104,7 +104,7 @@ U_BOOT_CMD_START(readline)
|
|||
U_BOOT_CMD_END
|
||||
|
||||
int
|
||||
do_exit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
do_exit (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int r;
|
||||
|
||||
|
@ -147,7 +147,7 @@ void u_boot_cmd_usage(cmd_tbl_t *cmdtp)
|
|||
* Use puts() instead of printf() to avoid printf buffer overflow
|
||||
* for long help messages
|
||||
*/
|
||||
int do_help (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||
int do_help (cmd_tbl_t * cmdtp, int argc, char *argv[])
|
||||
{
|
||||
if (argc == 1) { /*show list of commands */
|
||||
int cmd_items = &__u_boot_cmd_end -
|
||||
|
|
|
@ -218,7 +218,7 @@ int export(const char *varname)
|
|||
return -1;
|
||||
}
|
||||
|
||||
int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_printenv (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
struct variable_d *var;
|
||||
struct env_context *c;
|
||||
|
@ -265,7 +265,7 @@ U_BOOT_CMD_START(printenv)
|
|||
U_BOOT_CMD_END
|
||||
|
||||
#ifdef CONFIG_SIMPLE_PARSER
|
||||
int do_setenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_setenv ( cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
if (argc < 2) {
|
||||
printf ("Usage:\n%s\n", cmdtp->usage);
|
||||
|
@ -290,7 +290,7 @@ U_BOOT_CMD_END
|
|||
|
||||
#endif
|
||||
|
||||
int do_export ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_export ( cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
int i = 1;
|
||||
|
||||
|
|
|
@ -467,7 +467,6 @@ static int run_pipe_real(struct pipe *pi)
|
|||
{
|
||||
int i;
|
||||
int nextin;
|
||||
int flag = 0;
|
||||
struct child_prog *child;
|
||||
cmd_tbl_t *cmdtp;
|
||||
char *p;
|
||||
|
@ -535,30 +534,18 @@ static int run_pipe_real(struct pipe *pi)
|
|||
return last_return_code;
|
||||
}
|
||||
if (strchr(child->argv[i], '/')) {
|
||||
return execute_script(child->argv[i], child->argc-i,&child->argv[i]);
|
||||
return execute_script(child->argv[i], child->argc-i, &child->argv[i]);
|
||||
}
|
||||
if ((path = find_execable(child->argv[i]))) {
|
||||
printf("path: %s\n", path);
|
||||
ret = execute_script(path, child->argc-i,&child->argv[i]);
|
||||
ret = execute_script(path, child->argc-i, &child->argv[i]);
|
||||
free(path);
|
||||
return ret;
|
||||
}
|
||||
/* Look up command in command table */
|
||||
if ((cmdtp = find_cmd(child->argv[i]))) {
|
||||
int rcode;
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_BOOTD)
|
||||
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||
|
||||
/* avoid "bootd" recursion */
|
||||
if (cmdtp->cmd == do_bootd) {
|
||||
if (flag & CMD_FLAG_BOOTD) {
|
||||
printf ("'bootd' recursion detected\n");
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
flag |= CMD_FLAG_BOOTD;
|
||||
}
|
||||
#endif /* CFG_CMD_BOOTD */
|
||||
/* found - check max args */
|
||||
if ((child->argc - i) > cmdtp->maxargs) {
|
||||
printf ("Usage:\n%s\n", cmdtp->usage);
|
||||
|
@ -567,7 +554,7 @@ static int run_pipe_real(struct pipe *pi)
|
|||
child->argv+=i; /* XXX horrible hack */
|
||||
/* OK - call function to do the command */
|
||||
|
||||
rcode = cmdtp->cmd(cmdtp, flag,child->argc-i,&child->argv[i]);
|
||||
rcode = cmdtp->cmd(cmdtp, child->argc-i, &child->argv[i]);
|
||||
|
||||
|
||||
child->argv-=i; /* XXX restore hack so free() can work right */
|
||||
|
@ -1486,7 +1473,7 @@ int run_shell(void)
|
|||
return rcode;
|
||||
}
|
||||
|
||||
static int do_sh(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_sh(cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
if (argc < 2) {
|
||||
printf ("Usage:\n%s\n", cmdtp->usage);
|
||||
|
@ -1508,7 +1495,7 @@ U_BOOT_CMD_START(sh)
|
|||
U_BOOT_CMD_HELP(cmd_sh_help)
|
||||
U_BOOT_CMD_END
|
||||
|
||||
static int do_source(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
static int do_source(cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
if (argc < 2) {
|
||||
printf ("Usage:\n%s\n", cmdtp->usage);
|
||||
|
|
|
@ -41,7 +41,7 @@ struct cmd_tbl_s {
|
|||
char **aliases;
|
||||
int maxargs; /* maximum number of arguments */
|
||||
/* Implementation function */
|
||||
int (*cmd)(struct cmd_tbl_s *, int, int, char *[]);
|
||||
int (*cmd)(struct cmd_tbl_s *, int, char *[]);
|
||||
char *usage; /* Usage message (short) */
|
||||
#ifdef CONFIG_LONGHELP
|
||||
char *help; /* Help message (long) */
|
||||
|
@ -78,19 +78,13 @@ extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *
|
|||
*
|
||||
* All commands use a common argument format:
|
||||
*
|
||||
* void function (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||
* void function (cmd_tbl_t *cmdtp, int argc, char *argv[]);
|
||||
*/
|
||||
|
||||
typedef void command_t (cmd_tbl_t *, int, int, char *[]);
|
||||
typedef void command_t (cmd_tbl_t *, int, char *[]);
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
/*
|
||||
* Command Flags:
|
||||
*/
|
||||
#define CMD_FLAG_REPEAT 0x0001 /* repeat last command */
|
||||
#define CMD_FLAG_BOOTD 0x0002 /* command is from bootd */
|
||||
|
||||
/*
|
||||
* Configurable monitor commands definitions have been moved
|
||||
* to include/cmd_confdefs.h
|
||||
|
|
|
@ -327,7 +327,7 @@ int dummy_probe(struct device_d *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int do_devinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_devinfo ( cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
struct device_d *dev = first_device;
|
||||
struct driver_d *drv = first_driver;
|
||||
|
|
|
@ -88,7 +88,7 @@ void PingStart(void)
|
|||
PingSend();
|
||||
}
|
||||
|
||||
int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
int do_ping (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||
{
|
||||
if (argc < 2)
|
||||
return -1;
|
||||
|
|
Loading…
Reference in New Issue