diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-12-13 20:06:47 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-12-13 20:06:47 +0000 |
| commit | d118689cb79412586704fe4ebe9a15611a975485 (patch) | |
| tree | aae8663ffd77c07bfc17a7e44cc392873358f530 /target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch | |
| parent | aa4cbcc9bbdaa824856d4feb9e2ead156e263a39 (diff) | |
| download | master-187ad058-d118689cb79412586704fe4ebe9a15611a975485.tar.gz master-187ad058-d118689cb79412586704fe4ebe9a15611a975485.tar.bz2 master-187ad058-d118689cb79412586704fe4ebe9a15611a975485.zip | |
kernel: move old firmware uimage splitter into separated patch
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 <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43696 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch | 21 |
1 files changed, 8 insertions, 13 deletions
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; |