aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-10-07 07:35:17 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-10-07 07:35:17 +0000
commitb9d3767ada27b9177f6a7ed9f33ab2b2c8fde704 (patch)
treed2a5cd78eb91654299452947dac8a5c4dddbfd8d /target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
parent2818493e823e1d01ef6e6b04343034d79021d7a3 (diff)
downloadupstream-b9d3767ada27b9177f6a7ed9f33ab2b2c8fde704.tar.gz
upstream-b9d3767ada27b9177f6a7ed9f33ab2b2c8fde704.tar.bz2
upstream-b9d3767ada27b9177f6a7ed9f33ab2b2c8fde704.zip
kernel: move old "rootfs" splitter into separated file
This will simplify removing it in the future. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 42828
Diffstat (limited to 'target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch')
-rw-r--r--target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch59
1 files changed, 3 insertions, 56 deletions
diff --git a/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
index e618dd6224..ede59104b3 100644
--- a/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
+++ b/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);