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 <swarren@nvidia.com>

diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index 7f225987a0d838368c2b5e5f9066b043479484c5..f25e22b0a8a3e3f6d94f210bc2ff585ac167aa67 100644 (file)
--- 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 b50bd0ae9a034353b4b358981d6f128d3b8c8c72..dcf76a50cde54d103419b0533146dd3f8f96592f 100644 (file)
--- 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 82804838d54b1442b52db998598e2e0d9c8797fd..2e2301e5813386e4c7f1aed6b40a972309be0042 100644 (file)
--- 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 46fcef78eeb24ddcbc343aa678243cf88984d0f0..a681d03d1b1d80d515eb7aa82bdbfbf13ce7b84e 100644 (file)
--- a/common/cmd_fs.c
+++ b/common/cmd_fs.c
@@ -20,13 +20,13 @@
 #include <command.h>
 #include <fs.h>
 
-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",
        "<interface> [<dev[:part]> [<addr> [<filename> [bytes [pos]]]]]\n"
        "    - Load binary file 'filename' from partition 'part' on device\n"

diff --git a/fs/fs.c b/fs/fs.c
index 1553af59d3733e24faf7396906329cf991d677fa..ff360afd4b072a22fbe0ab7355206fc2d9e482a6 100644 (file)
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -247,7 +247,7 @@ int fs_read(const char *filename, ulong addr, int offset, int len)
        return ret;
 }
 
-int do_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
+int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
                int fstype, int cmdline_base)
 {
        unsigned long addr;

diff --git a/include/fs.h b/include/fs.h
index c3ac7ccc0d9dbfd972443da200ef463a0a86c269..4f30a385a03ca2d2a4e2fe65b6b38168acdced07 100644 (file)
--- a/include/fs.h
+++ b/include/fs.h
@@ -57,7 +57,7 @@ int fs_read(const char *filename, ulong addr, int offset, int len);
  * Common implementation for various filesystem commands, optionally limited
  * to a specific filesystem type via the fstype parameter.
  */
-int do_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
+int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
                int fstype, int cmdline_base);
 int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
                int fstype);