From f9b55e22856a97523074f3dc40ea5d196298756a Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 31 Oct 2012 11:05:07 +0000 Subject: fs: rename fsload command to load When the generic filesystem load command "fsload" was written, I felt that "load" was too generic of a name for it, since many other similar commands already existed. However, it turns out that there is already an "fsload" command, so that name cannot be used. Rename the new "fsload" to plain "load" to avoid the conflict. At least anyone who's used a Basic interpreter should feel familiar with the name! Signed-off-by: Stephen Warren --- common/cmd_ext2.c | 2 +- common/cmd_ext4.c | 2 +- common/cmd_fat.c | 2 +- common/cmd_fs.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'common') diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c index 7f22598..f25e22b 100644 --- a/common/cmd_ext2.c +++ b/common/cmd_ext2.c @@ -49,7 +49,7 @@ int do_ext2ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) */ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16); + return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16); } U_BOOT_CMD( diff --git a/common/cmd_ext4.c b/common/cmd_ext4.c index b50bd0a..dcf76a5 100644 --- a/common/cmd_ext4.c +++ b/common/cmd_ext4.c @@ -59,7 +59,7 @@ int do_ext4_load(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { - return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16); + return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16); } int do_ext4_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) diff --git a/common/cmd_fat.c b/common/cmd_fat.c index 8280483..2e2301e 100644 --- a/common/cmd_fat.c +++ b/common/cmd_fat.c @@ -35,7 +35,7 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_FAT, 16); + return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT, 16); } diff --git a/common/cmd_fs.c b/common/cmd_fs.c index 46fcef7..a681d03 100644 --- a/common/cmd_fs.c +++ b/common/cmd_fs.c @@ -20,13 +20,13 @@ #include #include -int do_fsload_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_load_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_ANY, 0); + return do_load(cmdtp, flag, argc, argv, FS_TYPE_ANY, 0); } U_BOOT_CMD( - fsload, 7, 0, do_fsload_wrapper, + load, 7, 0, do_load_wrapper, "load binary file from a filesystem", " [ [ [ [bytes [pos]]]]]\n" " - Load binary file 'filename' from partition 'part' on device\n" -- cgit v1.1