1 files changed, 0 insertions, 182 deletions
diff --git a/0007-fs-implement-infra-structure-for-an-exists-function.patch b/0007-fs-implement-infra-structure-for-an-exists-function.patch
deleted file mode 100644
index 3c01a66..0000000
--- a/0007-fs-implement-infra-structure-for-an-exists-function.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 507d9019944b07ec9d54a7ebb3e6553aaf987de6 Mon Sep 17 00:00:00 2001
-From: Stephen Warren <swarren@nvidia.com>
-Date: Thu, 23 Jan 2014 12:56:57 -0700
-Subject: [PATCH 07/13] fs: implement infra-structure for an 'exists' function
-
-This could be used in scripts such as:
-
-if exists mmc 0:1 /boot/boot.scr; then
-    load mmc 0:1 ${scriptaddr} /boot/boot.scr
-    source ${scriptaddr}
-fi
-
-rather than:
-
-if load mmc 0:1 ${scriptaddr} /boot/boot.scr; then
-    source ${scriptaddr}
-fi
-
-This prevents errors being printed by attempts to load non-existent
-files, which can be important when checking for a large set of files,
-such as /boot/boot.scr.uimg, /boot/boot.scr, /boot/extlinux.conf,
-/boot.scr.uimg, /boot.scr, /extlinux.conf.
-
-Signed-off-by: Stephen Warren <swarren@nvidia.com>
-Acked-by: Simon Glass <sjg@chromium.org>
----
- common/cmd_fs.c | 14 ++++++++++++++
- fs/fs.c         | 38 ++++++++++++++++++++++++++++++++++++++
- include/fs.h    | 10 ++++++++++
- 3 files changed, 62 insertions(+)
-
-diff --git a/common/cmd_fs.c b/common/cmd_fs.c
-index 91a205a..44b00cd 100644
---- a/common/cmd_fs.c
-+++ b/common/cmd_fs.c
-@@ -49,3 +49,17 @@ U_BOOT_CMD(
- 	"    - List files in directory 'directory' of partition 'part' on\n"
- 	"      device type 'interface' instance 'dev'."
- );
-+
-+int do_exists_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-+{
-+	return do_exists(cmdtp, flag, argc, argv, FS_TYPE_ANY);
-+}
-+
-+U_BOOT_CMD(
-+	exists,	4,	0,	do_exists_wrapper,
-+	"determine whether a file exists",
-+	"<interface> <dev[:part]> filename\n"
-+	"    - Determine whether 'filename' exists in partition 'part' on\n"
-+	"      device type 'interface' instance 'dev', and set the command.\n"
-+	"      exit status so that 'if exists ...; then' works.\n"
-+);
-diff --git a/fs/fs.c b/fs/fs.c
-index 9c2ef6b..f3d9a1c 100644
---- a/fs/fs.c
-+++ b/fs/fs.c
-@@ -41,6 +41,11 @@ static inline int fs_ls_unsupported(const char *dirname)
- 	return -1;
- }
- 
-+static inline int fs_exists_unsupported(const char *filename)
-+{
-+	return -1;
-+}
-+
- static inline int fs_read_unsupported(const char *filename, void *buf,
- 				      int offset, int len)
- {
-@@ -62,6 +67,7 @@ struct fstype_info {
- 	int (*probe)(block_dev_desc_t *fs_dev_desc,
- 		     disk_partition_t *fs_partition);
- 	int (*ls)(const char *dirname);
-+	int (*exists)(const char *filename);
- 	int (*read)(const char *filename, void *buf, int offset, int len);
- 	int (*write)(const char *filename, void *buf, int offset, int len);
- 	void (*close)(void);
-@@ -74,6 +80,7 @@ static struct fstype_info fstypes[] = {
- 		.probe = fat_set_blk_dev,
- 		.close = fat_close,
- 		.ls = file_fat_ls,
-+		.exists = fs_exists_unsupported,
- 		.read = fat_read_file,
- 		.write = fs_write_unsupported,
- 	},
-@@ -84,6 +91,7 @@ static struct fstype_info fstypes[] = {
- 		.probe = ext4fs_probe,
- 		.close = ext4fs_close,
- 		.ls = ext4fs_ls,
-+		.exists = fs_exists_unsupported,
- 		.read = ext4_read_file,
- 		.write = fs_write_unsupported,
- 	},
-@@ -94,6 +102,7 @@ static struct fstype_info fstypes[] = {
- 		.probe = sandbox_fs_set_blk_dev,
- 		.close = sandbox_fs_close,
- 		.ls = sandbox_fs_ls,
-+		.exists = fs_exists_unsupported,
- 		.read = fs_read_sandbox,
- 		.write = fs_write_sandbox,
- 	},
-@@ -103,6 +112,7 @@ static struct fstype_info fstypes[] = {
- 		.probe = fs_probe_unsupported,
- 		.close = fs_close_unsupported,
- 		.ls = fs_ls_unsupported,
-+		.exists = fs_exists_unsupported,
- 		.read = fs_read_unsupported,
- 		.write = fs_write_unsupported,
- 	},
-@@ -184,6 +194,19 @@ int fs_ls(const char *dirname)
- 	return ret;
- }
- 
-+int fs_exists(const char *filename)
-+{
-+	int ret;
-+
-+	struct fstype_info *info = fs_get_info(fs_type);
-+
-+	ret = info->exists(filename);
-+
-+	fs_close();
-+
-+	return ret;
-+}
-+
- int fs_read(const char *filename, ulong addr, int offset, int len)
- {
- 	struct fstype_info *info = fs_get_info(fs_type);
-@@ -309,6 +332,21 @@ int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
- 	return 0;
- }
- 
-+int do_exists(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
-+		int fstype)
-+{
-+	if (argc != 4)
-+		return CMD_RET_USAGE;
-+
-+	if (fs_set_blk_dev(argv[1], argv[2], fstype))
-+		return 1;
-+
-+	if (fs_exists(argv[3]))
-+		return 1;
-+
-+	return 0;
-+}
-+
- int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
- 		int fstype)
- {
-diff --git a/include/fs.h b/include/fs.h
-index 97b0094..b8b7706 100644
---- a/include/fs.h
-+++ b/include/fs.h
-@@ -44,6 +44,14 @@ int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype);
- int fs_ls(const char *dirname);
- 
- /*
-+ * Determine whether a file exists
-+ *
-+ * Returns 0 if the file exists, non-zero if it doesn't exist.
-+ * This encoding was picked to help shell command implementation.
-+ */
-+int fs_exists(const char *filename);
-+
-+/*
-  * Read file "filename" from the partition previously set by fs_set_blk_dev(),
-  * to address "addr", starting at byte offset "offset", and reading "len"
-  * bytes. "offset" may be 0 to read from the start of the file. "len" may be
-@@ -72,6 +80,8 @@ int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
- 		int fstype);
- int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
- 		int fstype);
-+int do_exists(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
-+		int fstype);
- int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
- 		int fstype);
- 
--- 
-1.8.5.3
-