target/linux/generic/patches-3.18/406-mtd-old-rootfs-squashfs-splitter.patch

   1 --- a/drivers/mtd/Kconfig
   2 +++ b/drivers/mtd/Kconfig
   3 @@ -18,6 +18,11 @@ config MTD_ROOTFS_ROOT_DEV
   4         bool "Automatically set 'rootfs' partition to be root filesystem"
   5         default y
   6
   7 +config MTD_ROOTFS_SPLIT
   8 +       bool "Automatically split 'rootfs' partition for squashfs"
   9 +       select MTD_SPLIT
  10 +       default y
  11 +
  12  config MTD_SPLIT_FIRMWARE
  13         bool "Automatically split firmware partition for kernel+rootfs"
  14         default y
  15 --- a/drivers/mtd/mtdpart.c
  16 +++ b/drivers/mtd/mtdpart.c
  17 @@ -681,6 +681,47 @@ mtd_pad_erasesize(struct mtd_info *mtd,
  18         return len;
  19  }
  20
  21 +static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
  22 +{
  23 +       size_t squashfs_len;
  24 +       int len, ret;
  25 +
  26 +       ret = mtd_get_squashfs_len(master, offset, &squashfs_len);
  27 +       if (ret)
  28 +               return ret;
  29 +
  30 +       len = mtd_pad_erasesize(master, offset, squashfs_len);
  31 +       *split_offset = offset + len;
  32 +
  33 +       return 0;
  34 +}
  35 +
  36 +static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
  37 +{
  38 +       unsigned int split_offset = 0;
  39 +       unsigned int split_size;
  40 +       int ret;
  41 +
  42 +       ret = split_squashfs(master, part->offset, &split_offset);
  43 +       if (ret)
  44 +               return;
  45 +
  46 +       if (split_offset <= 0)
  47 +               return;
  48 +
  49 +       if (config_enabled(CONFIG_MTD_SPLIT_SQUASHFS_ROOT))
  50 +               pr_err("Dedicated partitioner didn't create \"rootfs_data\" partition, please fill a bug report!\n");
  51 +       else
  52 +               pr_warn("Support for built-in \"rootfs_data\" splitter will be removed, please use CONFIG_MTD_SPLIT_SQUASHFS_ROOT\n");
  53 +
  54 +       split_size = part->mtd.size - (split_offset - part->offset);
  55 +       printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
  56 +               ROOTFS_SPLIT_NAME, split_offset, split_size);
  57 +
  58 +       __mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
  59 +                           split_size, false);
  60 +}
  61 +
  62  #define UBOOT_MAGIC    0x27051956
  63
  64  static void split_uimage(struct mtd_info *master, struct mtd_part *part)
  65 @@ -743,7 +784,10 @@ static void mtd_partition_split(struct m
  66                 return;
  67
  68         if (!strcmp(part->mtd.name, "rootfs")) {
  69 -               run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
  70 +               int num = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
  71 +
  72 +               if (num <= 0 && config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
  73 +                       split_rootfs_data(master, part);
  74
  75                 rootfs_found = 1;
  76         }