summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-10-31 11:05:07 +0000
committerTom Rini <trini@ti.com>2012-11-04 11:00:34 -0700
commitf9b55e22856a97523074f3dc40ea5d196298756a (patch)
treed290dc3c5c001321012061ca1c121894e1b94fa0 /common
parent3f83c87ee58d86e9a9d2e50b62f38c728bfb31f6 (diff)
downloadblackbird-obmc-uboot-f9b55e22856a97523074f3dc40ea5d196298756a.tar.gz
blackbird-obmc-uboot-f9b55e22856a97523074f3dc40ea5d196298756a.zip
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>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_ext2.c2
-rw-r--r--common/cmd_ext4.c2
-rw-r--r--common/cmd_fat.c2
-rw-r--r--common/cmd_fs.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index 7f225987a0..f25e22b0a8 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 b50bd0ae9a..dcf76a50cd 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 82804838d5..2e2301e581 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 46fcef78ee..a681d03d1b 100644
--- 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"
OpenPOWER on IntegriCloud