Bladeren bron

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>
Simon Glass 4 jaren geleden
bovenliggende
commit
1444998230
5 gewijzigde bestanden met toevoegingen van 25 en 7 verwijderingen
  1. 1 0
      board/inversepath/usbarmory/usbarmory.c
  2. 1 1
      cmd/fat.c
  3. 1 0
      cmd/pxe.c
  4. 0 6
      include/common.h
  5. 22 0
      include/fs.h

+ 1 - 0
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>

+ 1 - 1
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);
 }

+ 1 - 0
cmd/pxe.c

@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <fs.h>
 #include <net.h>
 
 #include "pxe_utils.h"

+ 0 - 6
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);
 

+ 22 - 0
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