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>

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>
Stephen Warren · Tom Rini
1 parent 3f83c87ee5
Showing 6 changed files with 8 additions and 8 deletions Side-by-side Diff
common/cmd_ext2.c
common/cmd_ext4.c
common/cmd_fat.c
common/cmd_fs.c
fs/fs.c
include/fs.h
@@ -49,7 +49,7 @@
  */
 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(
@@ -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[])
@@ -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);
 }
  
  
@@ -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"
@@ -247,7 +247,7 @@
 	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;
@@ -57,7 +57,7 @@
  * 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);
...	...	@@ -49,7 +49,7 @@
49	49	*/
50	50	int do_ext2load (cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
51	51	{
52		- return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16);
	52	+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16);
53	53	}
54	54
55	55	U_BOOT_CMD(
...	...	@@ -59,7 +59,7 @@
59	59	int do_ext4_load(cmd_tbl_t *cmdtp, int flag, int argc,
60	60	char *const argv[])
61	61	{
62		- return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16);
	62	+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16);
63	63	}
64	64
65	65	int do_ext4_ls(cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
...	...	@@ -35,7 +35,7 @@
35	35
36	36	int do_fat_fsload (cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
37	37	{
38		- return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_FAT, 16);
	38	+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT, 16);
39	39	}
40	40
41	41
...	...	@@ -20,13 +20,13 @@
20	20	#include <command.h>
21	21	#include <fs.h>
22	22
23		-int do_fsload_wrapper(cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
	23	+int do_load_wrapper(cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
24	24	{
25		- return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_ANY, 0);
	25	+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_ANY, 0);
26	26	}
27	27
28	28	U_BOOT_CMD(
29		- fsload, 7, 0, do_fsload_wrapper,
	29	+ load, 7, 0, do_load_wrapper,
30	30	"load binary file from a filesystem",
31	31	"<interface> [<dev[:part]> [<addr> [<filename> [bytes [pos]]]]]\n"
32	32	" - Load binary file 'filename' from partition 'part' on device\n"
...	...	@@ -247,7 +247,7 @@
247	247	return ret;
248	248	}
249	249
250		-int do_fsload(cmd_tbl_t cmdtp, int flag, int argc, char const argv[],
	250	+int do_load(cmd_tbl_t cmdtp, int flag, int argc, char const argv[],
251	251	int fstype, int cmdline_base)
252	252	{
253	253	unsigned long addr;
...	...	@@ -57,7 +57,7 @@
57	57	* Common implementation for various filesystem commands, optionally limited
58	58	* to a specific filesystem type via the fstype parameter.
59	59	*/
60		-int do_fsload(cmd_tbl_t cmdtp, int flag, int argc, char const argv[],
	60	+int do_load(cmd_tbl_t cmdtp, int flag, int argc, char const argv[],
61	61	int fstype, int cmdline_base);
62	62	int do_ls(cmd_tbl_t cmdtp, int flag, int argc, char const argv[],
63	63	int fstype);