aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-04-11 10:28:14 +0000
committerLuka Perkov <luka@openwrt.org>2015-04-11 10:28:14 +0000
commit88655056656fdbd9d021d8de11a6077fb49428da (patch)
treed3b641c3c5876ee5e79c67034a95a8fd532a4077 /target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch
parentb66b0ae6323fea7dedd400785c556a39a30cdf4f (diff)
downloadupstream-88655056656fdbd9d021d8de11a6077fb49428da.tar.gz
upstream-88655056656fdbd9d021d8de11a6077fb49428da.tar.bz2
upstream-88655056656fdbd9d021d8de11a6077fb49428da.zip
generic: drop 3.14
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 45375
Diffstat (limited to 'target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch')
-rw-r--r--target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch b/target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch
deleted file mode 100644
index cc52781847..0000000000
--- a/target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -27,6 +27,11 @@ config MTD_SPLIT_FIRMWARE_NAME
- depends on MTD_SPLIT_FIRMWARE
- default "firmware"
-
-+config MTD_UIMAGE_SPLIT
-+ bool "Enable split support for firmware partitions containing a uImage"
-+ depends on MTD_SPLIT_FIRMWARE
-+ default y
-+
- source "drivers/mtd/mtdsplit/Kconfig"
-
- endmenu
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -668,6 +668,37 @@ mtd_pad_erasesize(struct mtd_info *mtd,
- return len;
- }
-
-+#define UBOOT_MAGIC 0x27051956
-+
-+static void split_uimage(struct mtd_info *master, struct mtd_part *part)
-+{
-+ struct {
-+ __be32 magic;
-+ __be32 pad[2];
-+ __be32 size;
-+ } hdr;
-+ size_t len;
-+
-+ if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
-+ return;
-+
-+ if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
-+ return;
-+
-+ len = be32_to_cpu(hdr.size) + 0x40;
-+ len = mtd_pad_erasesize(master, part->offset, len);
-+ 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);
-+}
-+
- #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #else
-@@ -676,7 +707,14 @@ mtd_pad_erasesize(struct mtd_info *mtd,
-
- static void split_firmware(struct mtd_info *master, struct mtd_part *part)
- {
-- run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
-+ int ret;
-+
-+ ret = run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
-+ if (ret > 0)
-+ return;
-+
-+ if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
-+ split_uimage(master, part);
- }
-
- void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,