diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2017-06-23 10:47:18 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2017-06-23 11:40:05 +0200 |
commit | 4d5f296af857ecbd3916d1d156d1bc63c998995a (patch) | |
tree | ac9c9dac59054e607ad4c357bb2edc01669b5937 /target/linux/generic/patches-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch | |
parent | 8c1e760ab60994de26d2a2c85f91e86192999dfb (diff) | |
download | upstream-4d5f296af857ecbd3916d1d156d1bc63c998995a.tar.gz upstream-4d5f296af857ecbd3916d1d156d1bc63c998995a.tar.bz2 upstream-4d5f296af857ecbd3916d1d156d1bc63c998995a.zip |
kernel: backport upstream mtd support for partition parsers
In a log term it should replace our implementation. For now both can
coexist.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch')
-rw-r--r-- | target/linux/generic/patches-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/patches-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch index 02fb9cce3e..490107ec40 100644 --- a/target/linux/generic/patches-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +++ b/target/linux/generic/patches-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -723,6 +723,36 @@ int mtd_del_partition(struct mtd_info *m +@@ -761,6 +761,36 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -37,7 +37,7 @@ #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME #else -@@ -731,6 +761,7 @@ EXPORT_SYMBOL_GPL(mtd_del_partition); +@@ -769,6 +799,7 @@ EXPORT_SYMBOL_GPL(mtd_del_partition); static void split_firmware(struct mtd_info *master, struct mtd_part *part) { @@ -45,7 +45,7 @@ } void __weak arch_split_mtd_part(struct mtd_info *master, const char *name, -@@ -745,6 +776,12 @@ static void mtd_partition_split(struct m +@@ -783,6 +814,12 @@ static void mtd_partition_split(struct m if (rootfs_found) return; @@ -60,7 +60,7 @@ split_firmware(master, part); --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h -@@ -67,6 +67,8 @@ struct mtd_part_parser_data { +@@ -74,6 +74,8 @@ struct mtd_part_parser_data { enum mtd_parser_type { MTD_PARSER_TYPE_DEVICE = 0, |