aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch9
-rw-r--r--target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch4
-rw-r--r--target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch4
-rw-r--r--target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch2
4 files changed, 12 insertions, 7 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);
diff --git a/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch
index a434f6e392..7249b30c5a 100644
--- a/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch
+++ b/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 <juhosg@openwrt.org>
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -798,6 +798,30 @@ static struct mtd_part_parser *get_parti
+@@ -803,6 +803,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 <juhosg@openwrt.org>
void register_mtd_parser(struct mtd_part_parser *p)
{
spin_lock(&part_parser_lock);
-@@ -871,6 +895,38 @@ int parse_mtd_partitions(struct mtd_info
+@@ -876,6 +900,38 @@ int parse_mtd_partitions(struct mtd_info
return ret;
}
diff --git a/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
index 00a2e0e6fa..583e44ca12 100644
--- a/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
+++ b/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)
{
-@@ -709,6 +740,12 @@ static void split_uimage(struct mtd_info
+@@ -714,6 +745,12 @@ static void split_uimage(struct mtd_info
static void split_firmware(struct mtd_info *master, struct mtd_part *part)
{
@@ -51,7 +51,7 @@
if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
split_uimage(master, part);
}
-@@ -726,9 +763,12 @@ static void mtd_partition_split(struct m
+@@ -731,9 +768,12 @@ static void mtd_partition_split(struct m
return;
if (!strcmp(part->mtd.name, "rootfs")) {
diff --git a/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch b/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch
index 420095eb69..e5e7da3464 100644
--- a/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch
+++ b/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;
-@@ -984,6 +982,24 @@ int mtd_is_partition(const struct mtd_in
+@@ -989,6 +987,24 @@ int mtd_is_partition(const struct mtd_in
}
EXPORT_SYMBOL_GPL(mtd_is_partition);