aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch')
-rw-r--r--target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch9
1 files changed, 7 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch b/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch
index b63690a1d4..34a4b1aa8c 100644
--- a/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch
+++ b/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch
@@ -14,7 +14,7 @@
config MTD_SPLIT
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -681,6 +681,32 @@ mtd_pad_erasesize(struct mtd_info *mtd,
+@@ -681,6 +681,37 @@ mtd_pad_erasesize(struct mtd_info *mtd,
return len;
}
@@ -40,6 +40,11 @@
+ if (len + master->erasesize > part->mtd.size)
+ return;
+
++ if (config_enabled(CONFIG_MTD_SPLIT_UIMAGE_FW))
++ pr_err("Dedicated partitioner didn't split firmware partition, please fill a bug report!\n");
++ else
++ pr_warn("Support for built-in firmware splitter will be removed, please use CONFIG_MTD_SPLIT_UIMAGE_FW\n");
++
+ __mtd_add_partition(master, "rootfs", part->offset + len,
+ part->mtd.size - len, false);
+}
@@ -47,7 +52,7 @@
#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
#else
-@@ -689,7 +715,14 @@ mtd_pad_erasesize(struct mtd_info *mtd,
+@@ -689,7 +720,14 @@ mtd_pad_erasesize(struct mtd_info *mtd,
static void split_firmware(struct mtd_info *master, struct mtd_part *part)
{