kernel/3.1[02]: move MTD root device setup code to mtdcore

[openwrt/svn-archive/archive.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 f6ef8c7a6e54ae93d64ed0774541cf299161b167..6c17b01e53e71754cfd02a7a1a7a703bff5e752c 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
@@ -1,9 +1,11 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
-@@ -23,6 +23,23 @@ config MTD_TESTS
-         WARNING: some of the tests will ERASE entire MTD device which they
-         test. Do not use these tests unless you really know what you do.
+@@ -12,6 +12,32 @@ menuconfig MTD
  
+ if MTD
+ 
++menu "OpenWrt specific MTD options"
++
 +config MTD_ROOTFS_ROOT_DEV
 +      bool "Automatically set 'rootfs' partition to be root filesystem"
 +      default y
@@ -12,30 +14,36 @@
 +      bool "Automatically split 'rootfs' partition for squashfs"
 +      default y
 +
-+config MTD_UIMAGE_SPLIT
-+      bool "Automatically split off rootfs from a kernel partition containing a uImage"
++config MTD_SPLIT_FIRMWARE
++      bool "Automatically split firmware partition for kernel+rootfs"
 +      default y
 +
-+config MTD_UIMAGE_SPLIT_NAME
-+      string "uImage partition name"
-+      depends on MTD_UIMAGE_SPLIT
++config MTD_SPLIT_FIRMWARE_NAME
++      string "Firmware partition name"
++      depends on MTD_SPLIT_FIRMWARE
 +      default "firmware"
 +
- config MTD_REDBOOT_PARTS
-       tristate "RedBoot partition table parsing"
-       ---help---
++config MTD_UIMAGE_SPLIT
++      bool "Enable split support for firmware partitions containing a uImage"
++      depends on MTD_SPLIT_FIRMWARE
++      default y
++
++endmenu
++
+ config MTD_TESTS
+       tristate "MTD tests support (DANGEROUS)"
+       depends on m
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -29,6 +29,8 @@
+@@ -29,6 +29,7 @@
  #include <linux/kmod.h>
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
-+#include <linux/root_dev.h>
 +#include <linux/magic.h>
  #include <linux/err.h>
  
  #include "mtdcore.h"
-@@ -45,13 +47,14 @@ struct mtd_part {
+@@ -45,13 +46,14 @@ struct mtd_part {
        struct list_head list;
  };
  
@@ -51,7 +59,7 @@
  /*
   * MTD methods which simply translate the effective address and pass through
   * to the _real_ device.
-@@ -533,8 +536,10 @@ out_register:
+@@ -533,8 +535,10 @@ out_register:
        return slave;
  }
  
@@ -64,7 +72,7 @@
  {
        struct mtd_partition part;
        struct mtd_part *p, *new;
-@@ -566,21 +571,24 @@ int mtd_add_partition(struct mtd_info *m
+@@ -566,21 +570,24 @@ int mtd_add_partition(struct mtd_info *m
        end = offset + length;
  
        mutex_lock(&mtd_partitions_mutex);
@@ -99,7 +107,7 @@
  
        return ret;
  err_inv:
-@@ -590,6 +598,12 @@ err_inv:
+@@ -590,6 +597,12 @@ err_inv:
  }
  EXPORT_SYMBOL_GPL(mtd_add_partition);
  
@@ -112,7 +120,7 @@
  int mtd_del_partition(struct mtd_info *master, int partno)
  {
        struct mtd_part *slave, *next;
-@@ -613,6 +627,148 @@ int mtd_del_partition(struct mtd_info *m
+@@ -613,6 +626,144 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
@@ -192,12 +200,6 @@
 +
 +#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 {
@@ -207,9 +209,6 @@
 +      } hdr;
 +      size_t len;
 +
-+      if (strcmp(part->mtd.name, UIMAGE_SPLIT_NAME) != 0)
-+              return;
-+
 +      if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
 +              return;
 +
@@ -225,12 +224,23 @@
 +                          part->mtd.size - len, false);
 +}
 +
++#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#define SPLIT_FIRMWARE_NAME   CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#else
++#define SPLIT_FIRMWARE_NAME   "unused"
++#endif
++
++static void split_firmware(struct mtd_info *master, struct mtd_part *part)
++{
++      if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
++              split_uimage(master, part);
++}
++
 +void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
 +                                int offset, int size)
 +{
 +}
 +
-+
 +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
 +{
 +      static int rootfs_found = 0;
@@ -241,19 +251,13 @@
 +      if (!strcmp(part->mtd.name, "rootfs")) {
 +              rootfs_found = 1;
 +
-+              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);
-+              }
-+
 +              if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
 +                      split_rootfs_data(master, part);
 +      }
 +
-+      if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
-+              split_uimage(master, part);
++      if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
++          config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
++              split_firmware(master, part);
 +
 +      arch_split_mtd_part(master, part->mtd.name, part->offset,
 +                          part->mtd.size);
@@ -261,7 +265,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 +798,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -642,6 +793,7 @@ int add_mtd_partitions(struct mtd_info *
                mutex_unlock(&mtd_partitions_mutex);
  
                add_mtd_device(&slave->mtd);