diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-12-14 00:35:03 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-12-14 00:35:03 +0000 |
| commit | b1bfed548c5365fe99436a5fd1b9a5144e8acf09 (patch) | |
| tree | 4dba77855cb599b04357d051188bb082548ad95a | |
| parent | d54e759611030967000d0845cde8ec6bf8da20a7 (diff) | |
| download | master-31e0f0ae-b1bfed548c5365fe99436a5fd1b9a5144e8acf09.tar.gz master-31e0f0ae-b1bfed548c5365fe99436a5fd1b9a5144e8acf09.tar.bz2 master-31e0f0ae-b1bfed548c5365fe99436a5fd1b9a5144e8acf09.zip | |
kernel: warn users to use the new (dedicated) firmware splitter
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43700
4 files changed, 16 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.14/407-mtd-old-firmware-uimage-splitter.patch b/target/linux/generic/patches-3.14/407-mtd-old-firmware-uimage-splitter.patch index 9d8d975dde..3f7e910e72 100644 --- a/target/linux/generic/patches-3.14/407-mtd-old-firmware-uimage-splitter.patch +++ b/target/linux/generic/patches-3.14/407-mtd-old-firmware-uimage-splitter.patch @@ -14,7 +14,7 @@ config MTD_SPLIT --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -668,6 +668,32 @@ mtd_pad_erasesize(struct mtd_info *mtd, +@@ -668,6 +668,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 -@@ -676,7 +702,14 @@ mtd_pad_erasesize(struct mtd_info *mtd, +@@ -676,7 +707,14 @@ mtd_pad_erasesize(struct mtd_info *mtd, static void split_firmware(struct mtd_info *master, struct mtd_part *part) { diff --git a/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch b/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch index ff2c702a56..c29b137774 100644 --- a/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch +++ b/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch @@ -62,7 +62,7 @@ #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 +@@ -730,7 +771,10 @@ static void mtd_partition_split(struct m return; if (!strcmp(part->mtd.name, "rootfs")) { 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) { diff --git a/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch b/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch index 07d4f7d824..ca81958432 100644 --- a/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch +++ b/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch @@ -62,7 +62,7 @@ #define UBOOT_MAGIC 0x27051956 static void split_uimage(struct mtd_info *master, struct mtd_part *part) -@@ -738,7 +779,10 @@ static void mtd_partition_split(struct m +@@ -743,7 +784,10 @@ static void mtd_partition_split(struct m return; if (!strcmp(part->mtd.name, "rootfs")) { |