Author: rmilecki Date: 2014-12-14 01:35:03 +0100 (Sun, 14 Dec 2014) New Revision: 43700
Modified: trunk/target/linux/generic/patches-3.14/407-mtd-old-firmware-uimage-splitter.patch trunk/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch trunk/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch trunk/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch Log: kernel: warn users to use the new (dedicated) firmware splitter Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/generic/patches-3.14/407-mtd-old-firmware-uimage-splitter.patch =================================================================== --- trunk/target/linux/generic/patches-3.14/407-mtd-old-firmware-uimage-splitter.patch 2014-12-13 23:58:47 UTC (rev 43699) +++ trunk/target/linux/generic/patches-3.14/407-mtd-old-firmware-uimage-splitter.patch 2014-12-14 00:35:03 UTC (rev 43700) @@ -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) { Modified: trunk/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch =================================================================== --- trunk/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch 2014-12-13 23:58:47 UTC (rev 43699) +++ trunk/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch 2014-12-14 00:35:03 UTC (rev 43700) @@ -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")) { Modified: trunk/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch =================================================================== --- trunk/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch 2014-12-13 23:58:47 UTC (rev 43699) +++ trunk/target/linux/generic/patches-3.18/407-mtd-old-firmware-uimage-splitter.patch 2014-12-14 00:35:03 UTC (rev 43700) @@ -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) { Modified: trunk/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch =================================================================== --- trunk/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch 2014-12-13 23:58:47 UTC (rev 43699) +++ trunk/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch 2014-12-14 00:35:03 UTC (rev 43700) @@ -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")) { _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
