generic/3.10: remove unused defines from the rootfs split patch

[openwrt.git] / target / linux / generic / patches-3.10 / 400-mtd-add-rootfs-split-support.patch

diff --git a/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch
index 4cacf641d8eb1822ce5826a020410406db68f370..f6ef8c7a6e54ae93d64ed0774541cf299161b167 100644 (file)
--- a/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch
+++ b/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch
@@ -35,7 +35,7 @@
  #include <linux/err.h>
  
  #include "mtdcore.h"
-@@ -45,12 +47,14 @@ struct mtd_part {
+@@ -45,13 +47,14 @@ struct mtd_part {
        struct list_head list;
  };
  
@@ -46,12 +46,12 @@
   * the pointer to that structure with this macro.
   */
  #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->_read == part_read)
  
+-
  /*
   * MTD methods which simply translate the effective address and pass through
-@@ -533,8 +537,10 @@ out_register:
+  * to the _real_ device.
+@@ -533,8 +536,10 @@ out_register:
        return slave;
  }
  
@@ -64,7 +64,7 @@
  {
        struct mtd_partition part;
        struct mtd_part *p, *new;
-@@ -566,21 +572,24 @@ int mtd_add_partition(struct mtd_info *m
+@@ -566,21 +571,24 @@ int mtd_add_partition(struct mtd_info *m
        end = offset + length;
  
        mutex_lock(&mtd_partitions_mutex);
@@ -99,7 +99,7 @@
  
        return ret;
  err_inv:
-@@ -590,6 +599,12 @@ err_inv:
+@@ -590,6 +598,12 @@ err_inv:
  }
  EXPORT_SYMBOL_GPL(mtd_add_partition);
  
@@ -112,7 +112,7 @@
  int mtd_del_partition(struct mtd_info *master, int partno)
  {
        struct mtd_part *slave, *next;
-@@ -613,6 +628,149 @@ int mtd_del_partition(struct mtd_info *m
+@@ -613,6 +627,148 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
@@ -127,9 +127,7 @@
 +      return len;
 +}
 +
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
 +#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
 +
 +struct squashfs_super_block {
 +      __le32 s_magic;
@@ -191,11 +189,15 @@
 +      __mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
 +                          split_size, false);
 +}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
 +
-+#ifdef CONFIG_MTD_UIMAGE_SPLIT
 +#define UBOOT_MAGIC   0x27051956
 +
++#ifdef CONFIG_MTD_UIMAGE_SPLIT_NAME
++#define UIMAGE_SPLIT_NAME     CONFIG_MTD_UIMAGE_SPLIT_NAME
++#else
++#define UIMAGE_SPLIT_NAME     "unused"
++#endif
++
 +static void split_uimage(struct mtd_info *master, struct mtd_part *part)
 +{
 +      struct {
@@ -205,7 +207,7 @@
 +      } hdr;
 +      size_t len;
 +
-+      if (strcmp(part->mtd.name, CONFIG_MTD_UIMAGE_SPLIT_NAME) != 0)
++      if (strcmp(part->mtd.name, UIMAGE_SPLIT_NAME) != 0)
 +              return;
 +
 +      if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
@@ -222,7 +224,6 @@
 +      __mtd_add_partition(master, "rootfs", part->offset + len,
 +                          part->mtd.size - len, false);
 +}
-+#endif
 +
 +void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
 +                                int offset, int size)
@@ -240,21 +241,19 @@
 +      if (!strcmp(part->mtd.name, "rootfs")) {
 +              rootfs_found = 1;
 +
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+              if (ROOT_DEV == 0) {
++              if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++                  ROOT_DEV == 0) {
 +                      printk(KERN_NOTICE "mtd: partition \"rootfs\" "
 +                              "set to be root filesystem\n");
 +                      ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, part->mtd.index);
 +              }
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+              split_rootfs_data(master, part);
-+#endif
++
++              if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
++                      split_rootfs_data(master, part);
 +      }
 +
-+#ifdef CONFIG_MTD_UIMAGE_SPLIT
-+      split_uimage(master, part);
-+#endif
++      if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
++              split_uimage(master, part);
 +
 +      arch_split_mtd_part(master, part->mtd.name, part->offset,
 +                          part->mtd.size);
@@ -262,7 +261,7 @@
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
-@@ -642,6 +800,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -642,6 +798,7 @@ int add_mtd_partitions(struct mtd_info *
                mutex_unlock(&mtd_partitions_mutex);
  
                add_mtd_device(&slave->mtd);