qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sandbox: Renamed sb command to host 

As suggested by Simon Glass, rename the sb command to host but keep the
old sb command as an alias

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sjoerd Simons 2015-04-13 22:54:22 +02:00 committed by Simon Glass
parent 3202535c49
commit bacfb1df95
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Makefile
View File

@ -152,7 +152,7 @@ obj-$(CONFIG_CMD_PXE) += cmd_pxe.o
obj-$(CONFIG_CMD_READ) += cmd_read.o obj-$(CONFIG_CMD_READ) += cmd_read.o
obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o
obj-$(CONFIG_CMD_REISER) += cmd_reiser.o obj-$(CONFIG_CMD_REISER) += cmd_reiser.o
obj-$(CONFIG_SANDBOX) += cmd_sandbox.o obj-$(CONFIG_SANDBOX) += cmd_host.o
obj-$(CONFIG_CMD_SATA) += cmd_sata.o obj-$(CONFIG_CMD_SATA) += cmd_sata.o
obj-$(CONFIG_CMD_SF) += cmd_sf.o obj-$(CONFIG_CMD_SF) += cmd_sf.o
obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o

49
common/cmd_sandbox.c → common/cmd_host.c
View File

@ -10,25 +10,25 @@
#include <sandboxblockdev.h> #include <sandboxblockdev.h>
#include <asm/errno.h> #include <asm/errno.h>
static int do_sandbox_load(cmd_tbl_t *cmdtp, int flag, int argc, static int do_host_load(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
{ {
return do_load(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX); return do_load(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX);
} }
static int do_sandbox_ls(cmd_tbl_t *cmdtp, int flag, int argc, static int do_host_ls(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
{ {
return do_ls(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX); return do_ls(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX);
} }
static int do_sandbox_save(cmd_tbl_t *cmdtp, int flag, int argc, static int do_host_save(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
{ {
return do_save(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX); return do_save(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX);
} }
static int do_sandbox_bind(cmd_tbl_t *cmdtp, int flag, int argc, static int do_host_bind(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
{ {
if (argc < 2 || argc > 3) if (argc < 2 || argc > 3)
@ -44,7 +44,7 @@ static int do_sandbox_bind(cmd_tbl_t *cmdtp, int flag, int argc,
return host_dev_bind(dev, file); return host_dev_bind(dev, file);
} }
static int do_sandbox_info(cmd_tbl_t *cmdtp, int flag, int argc, static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
{ {
if (argc < 1 || argc > 2) if (argc < 1 || argc > 2)
@ -85,25 +85,25 @@ static int do_sandbox_info(cmd_tbl_t *cmdtp, int flag, int argc,
return 0; return 0;
} }
static cmd_tbl_t cmd_sandbox_sub[] = { static cmd_tbl_t cmd_host_sub[] = {
U_BOOT_CMD_MKENT(load, 7, 0, do_sandbox_load, "", ""), U_BOOT_CMD_MKENT(load, 7, 0, do_host_load, "", ""),
U_BOOT_CMD_MKENT(ls, 3, 0, do_sandbox_ls, "", ""), U_BOOT_CMD_MKENT(ls, 3, 0, do_host_ls, "", ""),
U_BOOT_CMD_MKENT(save, 6, 0, do_sandbox_save, "", ""), U_BOOT_CMD_MKENT(save, 6, 0, do_host_save, "", ""),
U_BOOT_CMD_MKENT(bind, 3, 0, do_sandbox_bind, "", ""), U_BOOT_CMD_MKENT(bind, 3, 0, do_host_bind, "", ""),
U_BOOT_CMD_MKENT(info, 3, 0, do_sandbox_info, "", ""), U_BOOT_CMD_MKENT(info, 3, 0, do_host_info, "", ""),
}; };
static int do_sandbox(cmd_tbl_t *cmdtp, int flag, int argc, static int do_host(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
{ {
cmd_tbl_t *c; cmd_tbl_t *c;
/* Skip past 'sandbox' */ /* Skip past 'host' */
argc--; argc--;
argv++; argv++;
c = find_cmd_tbl(argv[0], cmd_sandbox_sub, c = find_cmd_tbl(argv[0], cmd_host_sub,
ARRAY_SIZE(cmd_sandbox_sub)); ARRAY_SIZE(cmd_host_sub));
if (c) if (c)
return c->cmd(cmdtp, flag, argc, argv); return c->cmd(cmdtp, flag, argc, argv);
@ -112,15 +112,20 @@ static int do_sandbox(cmd_tbl_t *cmdtp, int flag, int argc,
} }
U_BOOT_CMD( U_BOOT_CMD(
sb, 8, 1, do_sandbox, sb, 8, 1, do_host,
"Miscellaneous sandbox commands", "Deprecated: use 'host' command instead.", ""
);
U_BOOT_CMD(
host, 8, 1, do_host,
"Miscellaneous host commands",
"load hostfs - <addr> <filename> [<bytes> <offset>] - " "load hostfs - <addr> <filename> [<bytes> <offset>] - "
"load a file from host\n" "load a file from host\n"
"sb ls hostfs - <filename> - list files on host\n" "host ls hostfs - <filename> - list files on host\n"
"sb save hostfs - <addr> <filename> <bytes> [<offset>] - " "host save hostfs - <addr> <filename> <bytes> [<offset>] - "
"save a file to host\n" "save a file to host\n"
"sb bind <dev> [<filename>] - bind \"host\" device to file\n" "host bind <dev> [<filename>] - bind \"host\" device to file\n"
"sb info [<dev>] - show device binding & info\n" "host info [<dev>] - show device binding & info\n"
"sb commands use the \"hostfs\" device. The \"host\" device is used\n" "host commands use the \"hostfs\" device. The \"host\" device is used\n"
"with standard IO commands such as fatls or ext2load" "with standard IO commands such as fatls or ext2load"
); );