From: Rafał Miłecki <ra...@milecki.pl>
No single target/arch uses it and most likely there is no need to make
such a potential code target/arch specific.
Signed-off-by: Rafał Miłecki <ra...@milecki.pl>
---
.../400-mtd-add-rootfs-split-support.patch | 22 ++--------------------
...port-for-different-partition-parser-types.patch | 2 +-
...mtd-parsers-for-rootfs-and-firmware-split.patch | 4 ++--
.../404-mtd-add-more-helper-functions.patch | 6 +++---
.../400-mtd-add-rootfs-split-support.patch | 22 ++--------------------
...port-for-different-partition-parser-types.patch | 2 +-
...mtd-parsers-for-rootfs-and-firmware-split.patch | 4 ++--
.../404-mtd-add-more-helper-functions.patch | 6 +++---
8 files changed, 16 insertions(+), 52 deletions(-)
diff --git
a/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
b/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
index 68737803d8..9512cb6fdc 100644
--- a/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
+++ b/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
@@ -68,7 +68,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
mtd_add_partition_attrs(new);
-@@ -736,6 +741,35 @@ int mtd_del_partition(struct mtd_info *m
+@@ -736,6 +741,27 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -82,11 +82,6 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
+{
+}
+
-+void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
-+ int offset, int size)
-+{
-+}
-+
+static void mtd_partition_split(struct mtd_info *master, struct mtd_part
*part)
+{
+ static int rootfs_found = 0;
@@ -97,14 +92,11 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
+ if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
+ IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE))
+ split_firmware(master, part);
-+
-+ arch_split_mtd_part(master, part->mtd.name, part->offset,
-+ part->mtd.size);
+}
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -767,6 +801,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -767,6 +793,7 @@ int add_mtd_partitions(struct mtd_info *
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&slave->mtd);
@@ -112,13 +104,3 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
mtd_add_partition_attrs(slave);
/* Look for subpartitions */
parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -110,5 +110,7 @@ int mtd_add_partition(struct mtd_info *m
- long long offset, long long length);
- int mtd_del_partition(struct mtd_info *master, int partno);
- uint64_t mtd_get_device_size(const struct mtd_info *mtd);
-+extern void __weak arch_split_mtd_part(struct mtd_info *master,
-+ const char *name, int offset, int size);
-
- #endif
diff --git
a/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch
b/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch
index a48ae87ea2..3c9028a32a 100644
---
a/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch
+++
b/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch
@@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos <juh...@openwrt.org>
#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
#else
-@@ -1118,6 +1152,61 @@ void mtd_part_parser_cleanup(struct mtd_
+@@ -1110,6 +1144,61 @@ void mtd_part_parser_cleanup(struct mtd_
}
}
diff --git
a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
index 3c105b2a47..9a469fdd24 100644
---
a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
+++
b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -17,8 +17,8 @@ Signed-off-by: Gabor Juhos <juh...@openwrt.org>
+ run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
}
- void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
-@@ -797,6 +798,12 @@ static void mtd_partition_split(struct m
+ static void mtd_partition_split(struct mtd_info *master, struct mtd_part
*part)
+@@ -792,6 +793,12 @@ static void mtd_partition_split(struct m
if (rootfs_found)
return;
diff --git
a/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch
b/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch
index b37563c902..0b4bf9e74b 100644
--- a/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch
+++ b/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juh...@openwrt.org>
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -1231,6 +1231,24 @@ int mtd_is_partition(const struct mtd_in
+@@ -1223,6 +1223,24 @@ int mtd_is_partition(const struct mtd_in
}
EXPORT_SYMBOL_GPL(mtd_is_partition);
@@ -72,5 +72,5 @@ Signed-off-by: Gabor Juhos <juh...@openwrt.org>
+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
+uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
uint64_t mtd_get_device_size(const struct mtd_info *mtd);
- extern void __weak arch_split_mtd_part(struct mtd_info *master,
- const char *name, int offset, int size);
+
+ #endif
diff --git
a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch
b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch
index b0cb273141..46606e8822 100644
--- a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch
+++ b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch
@@ -68,7 +68,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
mtd_add_partition_attrs(new);
-@@ -728,6 +733,35 @@ int mtd_del_partition(struct mtd_info *m
+@@ -728,6 +733,27 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -82,11 +82,6 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
+{
+}
+
-+void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
-+ int offset, int size)
-+{
-+}
-+
+static void mtd_partition_split(struct mtd_info *master, struct mtd_part
*part)
+{
+ static int rootfs_found = 0;
@@ -97,14 +92,11 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
+ if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
+ IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE))
+ split_firmware(master, part);
-+
-+ arch_split_mtd_part(master, part->mtd.name, part->offset,
-+ part->mtd.size);
+}
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -759,6 +793,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -759,6 +785,7 @@ int add_mtd_partitions(struct mtd_info *
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&slave->mtd);
@@ -112,13 +104,3 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
mtd_add_partition_attrs(slave);
/* Look for subpartitions */
parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -110,5 +110,7 @@ int mtd_add_partition(struct mtd_info *m
- long long offset, long long length);
- int mtd_del_partition(struct mtd_info *master, int partno);
- uint64_t mtd_get_device_size(const struct mtd_info *mtd);
-+extern void __weak arch_split_mtd_part(struct mtd_info *master,
-+ const char *name, int offset, int size);
-
- #endif
diff --git
a/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch
b/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch
index 0eb6d7422d..4d7951ea9c 100644
---
a/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch
+++
b/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch
@@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos <juh...@openwrt.org>
#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
#else
-@@ -1115,6 +1149,61 @@ void mtd_part_parser_cleanup(struct mtd_
+@@ -1107,6 +1141,61 @@ void mtd_part_parser_cleanup(struct mtd_
}
}
diff --git
a/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
b/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
index 3cb27c7605..1b886d527e 100644
---
a/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
+++
b/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -17,8 +17,8 @@ Signed-off-by: Gabor Juhos <juh...@openwrt.org>
+ run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
}
- void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
-@@ -789,6 +790,12 @@ static void mtd_partition_split(struct m
+ static void mtd_partition_split(struct mtd_info *master, struct mtd_part
*part)
+@@ -784,6 +785,12 @@ static void mtd_partition_split(struct m
if (rootfs_found)
return;
diff --git
a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch
b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch
index 300a0b0267..03959e80ec 100644
--- a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch
+++ b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juh...@openwrt.org>
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -1228,6 +1228,24 @@ int mtd_is_partition(const struct mtd_in
+@@ -1220,6 +1220,24 @@ int mtd_is_partition(const struct mtd_in
}
EXPORT_SYMBOL_GPL(mtd_is_partition);
@@ -72,5 +72,5 @@ Signed-off-by: Gabor Juhos <juh...@openwrt.org>
+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
+uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
uint64_t mtd_get_device_size(const struct mtd_info *mtd);
- extern void __weak arch_split_mtd_part(struct mtd_info *master,
- const char *name, int offset, int size);
+
+ #endif
--
2.13.7
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
