From: Rafał Miłecki <zajec5@gmail.com>
Date: Fri, 4 Dec 2015 09:33:04 +0000 (+0000)
Subject: kernel: drop old uimage splitter from 4.4
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=416243107bedcc4d0f85ab22eadcdd0279ea48de;p=openwrt%2Fstaging%2Fnbd.git

kernel: drop old uimage splitter from 4.4

For a long time we have a dedicated firmware splitter for uimage as a
replacement for the one builtin into mtd subsystem. For a year we got a
proper warning for users sticking to the old one (r43700). It should be
really safe to drop it now, especially since we do it for 4.4 only.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 47747
---

diff --git a/target/linux/generic/patches-4.4/405-mtd-old-firmware-uimage-splitter.patch b/target/linux/generic/patches-4.4/405-mtd-old-firmware-uimage-splitter.patch
deleted file mode 100644
index 430fd6f025..0000000000
--- a/target/linux/generic/patches-4.4/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
-@@ -696,6 +696,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
-@@ -704,7 +735,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,
diff --git a/target/linux/generic/patches-4.4/430-mtd-add-myloader-partition-parser.patch b/target/linux/generic/patches-4.4/430-mtd-add-myloader-partition-parser.patch
index fe74ad5927..a022564e9e 100644
--- a/target/linux/generic/patches-4.4/430-mtd-add-myloader-partition-parser.patch
+++ b/target/linux/generic/patches-4.4/430-mtd-add-myloader-partition-parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
-@@ -179,6 +179,22 @@ config MTD_BCM47XX_PARTS
+@@ -174,6 +174,22 @@ config MTD_BCM47XX_PARTS
  	  This provides partitions parser for devices based on BCM47xx
  	  boards.