kernel: move old "rootfs" splitter into separated file

This will simplify removing it in the future.

Signed-off-by: Rafał Miłecki <[email protected]>

SVN-Revision: 42828

target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch

@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
-@@ -12,6 +12,33 @@ menuconfig MTD
+@@ -12,6 +12,28 @@ menuconfig MTD
  
  if MTD
  
@@ -10,11 +10,6 @@
 +	bool "Automatically set 'rootfs' partition to be root filesystem"
 +	default y
 +
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	select MTD_SPLIT
-+	default y
-+
 +config MTD_SPLIT_FIRMWARE
 +	bool "Automatically split firmware partition for kernel+rootfs"
 +	default y
@@ -125,7 +120,7 @@
  int mtd_del_partition(struct mtd_info *master, int partno)
  {
  	struct mtd_part *slave, *next;
-@@ -614,6 +628,122 @@ int mtd_del_partition(struct mtd_info *m
+@@ -614,6 +628,74 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
@@ -140,47 +135,6 @@
 +	return len;
 +}
 +
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	size_t squashfs_len;
-+	int len, ret;
-+
-+	ret = mtd_get_squashfs_len(master, offset, &squashfs_len);
-+	if (ret)
-+		return ret;
-+
-+	len = mtd_pad_erasesize(master, offset, squashfs_len);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
-+{
-+	unsigned int split_offset = 0;
-+	unsigned int split_size;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return;
-+
-+	if (split_offset <= 0)
-+		return;
-+
-+	if (config_enabled(CONFIG_MTD_SPLIT_SQUASHFS_ROOT))
-+		pr_err("Dedicated partitioner didn't create \"rootfs_data\" partition, please fill a bug report!\n");
-+	else
-+		pr_warn("Support for built-in \"rootfs_data\" splitter will be removed, please use CONFIG_MTD_SPLIT_SQUASHFS_ROOT\n");
-+
-+	split_size = part->mtd.size - (split_offset - part->offset);
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
-+		ROOTFS_SPLIT_NAME, split_offset, split_size);
-+
-+	__mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
-+			    split_size, false);
-+}
-+
 +#define UBOOT_MAGIC	0x27051956
 +
 +static void split_uimage(struct mtd_info *master, struct mtd_part *part)
@@ -231,13 +185,6 @@
 +	if (rootfs_found)
 +		return;
 +
-+	if (!strcmp(part->mtd.name, "rootfs")) {
-+		rootfs_found = 1;
-+
-+		if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
-+			split_rootfs_data(master, part);
-+	}
-+
 +	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
 +	    config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
 +		split_firmware(master, part);
@@ -248,7 +195,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
-@@ -643,6 +773,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -643,6 +725,7 @@ int add_mtd_partitions(struct mtd_info *
  		mutex_unlock(&mtd_partitions_mutex);
  
  		add_mtd_device(&slave->mtd);

target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch

@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -803,6 +803,30 @@ static struct mtd_part_parser *get_parti
+@@ -755,6 +755,30 @@ static struct mtd_part_parser *get_parti
  
  #define put_partition_parser(p) do { module_put((p)->owner); } while (0)
  
@@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  void register_mtd_parser(struct mtd_part_parser *p)
  {
  	spin_lock(&part_parser_lock);
-@@ -876,6 +900,38 @@ int parse_mtd_partitions(struct mtd_info
+@@ -828,6 +852,38 @@ int parse_mtd_partitions(struct mtd_info
  	return ret;
  }
  

target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch

@@ -38,7 +38,7 @@
  static inline unsigned long
  mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
  {
-@@ -714,6 +745,12 @@ static void split_uimage(struct mtd_info
+@@ -673,6 +704,12 @@ static void split_uimage(struct mtd_info
  
  static void split_firmware(struct mtd_info *master, struct mtd_part *part)
  {
@@ -51,20 +51,19 @@
  	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
  		split_uimage(master, part);
  }
-@@ -731,9 +768,12 @@ static void mtd_partition_split(struct m
+@@ -689,6 +726,12 @@ static void mtd_partition_split(struct m
+ 	if (rootfs_found)
  		return;
  
- 	if (!strcmp(part->mtd.name, "rootfs")) {
-+		int ret;
++	if (!strcmp(part->mtd.name, "rootfs")) {
++		run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
 +
- 		rootfs_found = 1;
- 
--		if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
-+		ret = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
-+		if (ret <= 0 && config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
- 			split_rootfs_data(master, part);
- 	}
- 
++		rootfs_found = 1;
++	}
++
+ 	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
+ 	    config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
+ 		split_firmware(master, part);
 --- a/include/linux/mtd/partitions.h
 +++ b/include/linux/mtd/partitions.h
 @@ -70,6 +70,8 @@ struct mtd_part_parser_data {

target/linux/generic/patches-3.14/403-mtd-hook-mtdsplit-to-Kbuild.patch

@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
-@@ -37,6 +37,11 @@ config MTD_UIMAGE_SPLIT
+@@ -32,6 +32,11 @@ config MTD_UIMAGE_SPLIT
  	depends on MTD_SPLIT_FIRMWARE
  	default y
  

target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch

@@ -18,7 +18,7 @@
  	}
  	if (slave->offset == MTDPART_OFS_RETAIN) {
  		slave->offset = cur_offset;
-@@ -989,6 +987,24 @@ int mtd_is_partition(const struct mtd_in
+@@ -944,6 +942,24 @@ int mtd_is_partition(const struct mtd_in
  }
  EXPORT_SYMBOL_GPL(mtd_is_partition);
  

target/linux/generic/patches-3.14/406-mtd-hook-mtdsplit-into-Kbuild.patch

@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
-@@ -37,6 +37,8 @@ config MTD_UIMAGE_SPLIT
+@@ -32,6 +32,8 @@ config MTD_UIMAGE_SPLIT
  	depends on MTD_SPLIT_FIRMWARE
  	default y
  

target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch

@@ -0,0 +1,76 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -18,6 +18,11 @@ config MTD_ROOTFS_ROOT_DEV
+ 	bool "Automatically set 'rootfs' partition to be root filesystem"
+ 	default y
+ 
++config MTD_ROOTFS_SPLIT
++	bool "Automatically split 'rootfs' partition for squashfs"
++	select MTD_SPLIT
++	default y
++
+ config MTD_SPLIT_FIRMWARE
+ 	bool "Automatically split firmware partition for kernel+rootfs"
+ 	default y
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -668,6 +668,47 @@ mtd_pad_erasesize(struct mtd_info *mtd,
+ 	return len;
+ }
+ 
++static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
++{
++	size_t squashfs_len;
++	int len, ret;
++
++	ret = mtd_get_squashfs_len(master, offset, &squashfs_len);
++	if (ret)
++		return ret;
++
++	len = mtd_pad_erasesize(master, offset, squashfs_len);
++	*split_offset = offset + len;
++
++	return 0;
++}
++
++static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
++{
++	unsigned int split_offset = 0;
++	unsigned int split_size;
++	int ret;
++
++	ret = split_squashfs(master, part->offset, &split_offset);
++	if (ret)
++		return;
++
++	if (split_offset <= 0)
++		return;
++
++	if (config_enabled(CONFIG_MTD_SPLIT_SQUASHFS_ROOT))
++		pr_err("Dedicated partitioner didn't create \"rootfs_data\" partition, please fill a bug report!\n");
++	else
++		pr_warn("Support for built-in \"rootfs_data\" splitter will be removed, please use CONFIG_MTD_SPLIT_SQUASHFS_ROOT\n");
++
++	split_size = part->mtd.size - (split_offset - part->offset);
++	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
++		ROOTFS_SPLIT_NAME, split_offset, split_size);
++
++	__mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
++			    split_size, false);
++}
++
+ #define UBOOT_MAGIC	0x27051956
+ 
+ static void split_uimage(struct mtd_info *master, struct mtd_part *part)
+@@ -725,7 +766,10 @@ static void mtd_partition_split(struct m
+ 		return;
+ 
+ 	if (!strcmp(part->mtd.name, "rootfs")) {
+-		run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++		int num = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++
++		if (num <= 0 && config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
++			split_rootfs_data(master, part);
+ 
+ 		rootfs_found = 1;
+ 	}