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-06 15:07:54 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-10-06 15:07:54 +0000
commitd30e92884e6826c74e50dc656e3ae460ffbab91f (patch)
tree539808d65dc393a661a5036a4a2030492b7920a7 /target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
parenta58a4bb58045c509a4326f016d185c1821997b93 (diff)
downloadupstream-d30e92884e6826c74e50dc656e3ae460ffbab91f.tar.gz
upstream-d30e92884e6826c74e50dc656e3ae460ffbab91f.tar.bz2
upstream-d30e92884e6826c74e50dc656e3ae460ffbab91f.zip
kernel: add some warnings to the old (built-in) rootfs splitter
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 42806
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.patch9
1 files changed, 7 insertions, 2 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 4e68d8cbd5..e618dd6224 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
@@ -125,7 +125,7 @@
int mtd_del_partition(struct mtd_info *master, int partno)
{
struct mtd_part *slave, *next;
-@@ -614,6 +628,117 @@ int mtd_del_partition(struct mtd_info *m
+@@ -614,6 +628,122 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -168,6 +168,11 @@
+ 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);
@@ -243,7 +248,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 +768,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -643,6 +773,7 @@ int add_mtd_partitions(struct mtd_info *
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&slave->mtd);