From 2b4fbeb6d4f77fe3cb441a36f26a577166df381a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sat, 13 Dec 2014 20:06:47 +0000 Subject: kernel: move old firmware uimage splitter into separated patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will allow us to drop it in the future. This patch doesn't change the final mtdpart.c, it remains the same. Signed-off-by: Rafał Miłecki SVN-Revision: 43696 --- ...-mtd-parsers-for-rootfs-and-firmware-split.patch | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch') diff --git a/target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch index 0c335683ca..4d994221c5 100644 --- a/target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +++ b/target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch @@ -35,23 +35,18 @@ + return nr_parts; +} + - static inline unsigned long - mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len) - { -@@ -686,6 +717,12 @@ static void split_uimage(struct mtd_info + #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME + #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME + #else +@@ -649,6 +680,7 @@ EXPORT_SYMBOL_GPL(mtd_del_partition); static void split_firmware(struct mtd_info *master, struct mtd_part *part) { -+ 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); ++ run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE); } -@@ -702,6 +739,12 @@ static void mtd_partition_split(struct m + + void __weak arch_split_mtd_part(struct mtd_info *master, const char *name, +@@ -663,6 +695,12 @@ static void mtd_partition_split(struct m if (rootfs_found) return; -- cgit v1.2.3