aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
-rw-r--r--fs/fs.c2
-rw-r--r--include/fs.h2
6 files changed, 8 insertions, 8 deletions
diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index 7f225987a0d..f25e22b0a8a 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 b50bd0ae9a0..dcf76a50cde 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 82804838d54..2e2301e5813 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 46fcef78eeb..a681d03d1b1 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"
diff --git a/fs/fs.c b/fs/fs.c
index 1553af59d37..ff360afd4b0 100644
--- 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 c3ac7ccc0d9..4f30a385a03 100644
--- 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);