Merge branch 'master' of git://git.denx.de/u-boot-usb

[karo-tx-uboot.git] / drivers / mtd / mtdcore.c

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 64bd7d4d8aadd92ff22a2e8485030af1b84fdbec..3a81adaf60d5563d805e230515f12a3ca444439e 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -8,7 +8,7 @@
  */
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/compat.h>
+#include <linux/compat.h>
 #include <ubi_uboot.h>
 
 struct mtd_info *mtd_table[MAX_MTD_DEVICES];
@@ -25,8 +25,6 @@ int add_mtd_device(struct mtd_info *mtd)
                        mtd->index = i;
                        mtd->usecount = 0;
 
-                       printf("mtd: Giving out device %d to %s\n",
-                               i, mtd->name);
                        /* No need to get a refcount on the module containing
                           the notifier, since we hold the mtd_table_mutex */
 
@@ -144,3 +142,47 @@ void put_mtd_device(struct mtd_info *mtd)
        c = --mtd->usecount;
        BUG_ON(c < 0);
 }
+
+#if defined(CONFIG_CMD_MTDPARTS_SPREAD)
+/**
+ * mtd_get_len_incl_bad
+ *
+ * Check if length including bad blocks fits into device.
+ *
+ * @param mtd an MTD device
+ * @param offset offset in flash
+ * @param length image length
+ * @return image length including bad blocks in *len_incl_bad and whether or not
+ *         the length returned was truncated in *truncated
+ */
+void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
+                         const uint64_t length, uint64_t *len_incl_bad,
+                         int *truncated)
+{
+       *truncated = 0;
+       *len_incl_bad = 0;
+
+       if (!mtd->block_isbad) {
+               *len_incl_bad = length;
+               return;
+       }
+
+       uint64_t len_excl_bad = 0;
+       uint64_t block_len;
+
+       while (len_excl_bad < length) {
+               if (offset >= mtd->size) {
+                       *truncated = 1;
+                       return;
+               }
+
+               block_len = mtd->erasesize - (offset & (mtd->erasesize - 1));
+
+               if (!mtd->block_isbad(mtd, offset & ~(mtd->erasesize - 1)))
+                       len_excl_bad += block_len;
+
+               *len_incl_bad += block_len;
+               offset       += block_len;
+       }
+}
+#endif /* defined(CONFIG_CMD_MTDPARTS_SPREAD) */