common: Move functions for loading from fat/ext2 to fs.h

These are filesystem functions and belong in the filesystem header file.
Move them.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 19510184d8a6fa24f8cab79e33abbd182d911cab..e9eea40e45eb8ae7205991db031af9c3b94c1abc 100644 (file)
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <fs.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>

diff --git a/cmd/fat.c b/cmd/fat.c
index 4b9a7eaab05499c017e164c41cbdc492e7026f55..50df127f6d2c56cdce9392d0697d074f7cdd8dfc 100644 (file)
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -31,7 +31,7 @@ U_BOOT_CMD(
        "      and determine its size."
 );
 
-int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_fat_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }

diff --git a/cmd/pxe.c b/cmd/pxe.c
index 194a366aa152cf4ee620b00cc9b873566366f898..bce6728875a6c3de11edc6c07ca4b66244731005 100644 (file)
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <fs.h>
 #include <net.h>
 
 #include "pxe_utils.h"

diff --git a/include/common.h b/include/common.h
index 7e2de23ae4e6d3f73206916987966b226f7319e8..34ef346400c283e494e944e061ed3749fe1c6645 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -80,12 +80,6 @@ extern ulong load_addr;              /* Default Load Address */
 extern ulong save_addr;                /* Default Save Address */
 extern ulong save_size;                /* Default Save Size */
 
-/* common/cmd_fat.c */
-int do_fat_fsload(cmd_tbl_t *, int, int, char * const []);
-
-/* common/cmd_ext2.c */
-int do_ext2load(cmd_tbl_t *, int, int, char * const []);
-
 /* common/exports.c */
 void   jumptable_init(void);
 

diff --git a/include/fs.h b/include/fs.h
index 742a535b5f010675256f4a855df0509d3449142a..37e35c21206e96a1dac5320f28295cc92a595e15 100644 (file)
--- a/include/fs.h
+++ b/include/fs.h
@@ -14,6 +14,28 @@
 #define FS_TYPE_UBIFS  4
 #define FS_TYPE_BTRFS  5
 
+/**
+ * do_fat_fsload - Run the fatload command
+ *
+ * @cmdtp: Command information for fatload
+ * @flag: Command flags (CMD_FLAG_...)
+ * @argc: Number of arguments
+ * @argv: List of arguments
+ * @return result (see enum command_ret_t)
+ */
+int do_fat_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
+
+/**
+ * do_ext2load - Run the ext2load command
+ *
+ * @cmdtp: Command information for ext2load
+ * @flag: Command flags (CMD_FLAG_...)
+ * @argc: Number of arguments
+ * @argv: List of arguments
+ * @return result (see enum command_ret_t)
+ */
+int do_ext2load(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
+
 /*
  * Tell the fs layer which block device an partition to use for future
  * commands. This also internally identifies the filesystem that is present