[openwrt/openwrt] kernel: make mtd patches apply again
LEDE Commits
lede-commits at lists.infradead.org
Wed Mar 14 16:45:22 PDT 2018
hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/bf4aa52dbf9f4ecb4e48f815e30357976605a12a
commit bf4aa52dbf9f4ecb4e48f815e30357976605a12a
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Thu Mar 15 00:42:41 2018 +0100
kernel: make mtd patches apply again
This makes some of the mtd patches apply again after some generic
patches were changed.
These problems where found by build bot.
Fixes: ac9bcefa3b044 ("kernel: use V10 of mtd patchset adding support for "compatible" string")
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
.../kirkwood/patches-4.9/202-linksys-find-active-root.patch | 10 +++++-----
target/linux/lantiq/patches-4.14/0101-find_active_root.patch | 12 ++++++------
target/linux/lantiq/patches-4.9/0101-find_active_root.patch | 12 ++++++------
target/linux/mvebu/patches-4.14/100-find_active_root.patch | 10 +++++-----
target/linux/mvebu/patches-4.9/100-find_active_root.patch | 10 +++++-----
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch b/target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch
index cb705e6..f4156be 100644
--- a/target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch
+++ b/target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch
@@ -11,10 +11,10 @@ Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
+static int mangled_rootblock;
+
- static int parse_ofpart_partitions(struct mtd_info *master,
- const struct mtd_partition **pparts,
- struct mtd_part_parser_data *data)
-@@ -32,6 +34,7 @@ static int parse_ofpart_partitions(struc
+ static int parse_fixed_partitions(struct mtd_info *master,
+ const struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+@@ -32,6 +34,7 @@ static int parse_fixed_partitions(struct
struct mtd_partition *parts;
struct device_node *mtd_node;
struct device_node *ofpart_node;
@@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
const char *partname;
struct device_node *pp;
int nr_parts, i, ret = 0;
-@@ -110,9 +113,15 @@ static int parse_ofpart_partitions(struc
+@@ -110,9 +113,15 @@ static int parse_fixed_partitions(struct
parts[i].size = of_read_number(reg + a_cells, s_cells);
parts[i].of_node = pp;
diff --git a/target/linux/lantiq/patches-4.14/0101-find_active_root.patch b/target/linux/lantiq/patches-4.14/0101-find_active_root.patch
index 7232ffa..73361c8 100644
--- a/target/linux/lantiq/patches-4.14/0101-find_active_root.patch
+++ b/target/linux/lantiq/patches-4.14/0101-find_active_root.patch
@@ -36,10 +36,10 @@
+ }
+}
+
- static int parse_ofpart_partitions(struct mtd_info *master,
- const struct mtd_partition **pparts,
- struct mtd_part_parser_data *data)
-@@ -36,7 +68,8 @@ static int parse_ofpart_partitions(struc
+ static int parse_fixed_partitions(struct mtd_info *master,
+ const struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+@@ -36,7 +68,8 @@ static int parse_fixed_partitions(struct
struct device_node *pp;
int nr_parts, i, ret = 0;
bool dedicated = true;
@@ -49,7 +49,7 @@
/* Pull of_node from the master device node */
mtd_node = mtd_get_of_node(master);
-@@ -72,7 +105,9 @@ static int parse_ofpart_partitions(struc
+@@ -72,7 +105,9 @@ static int parse_fixed_partitions(struct
return 0;
parts = kzalloc(nr_parts * sizeof(*parts), GFP_KERNEL);
@@ -60,7 +60,7 @@
return -ENOMEM;
i = 0;
-@@ -121,12 +156,22 @@ static int parse_ofpart_partitions(struc
+@@ -121,12 +156,22 @@ static int parse_fixed_partitions(struct
if (of_get_property(pp, "lock", &len))
parts[i].mask_flags |= MTD_POWERUP_LOCK;
diff --git a/target/linux/lantiq/patches-4.9/0101-find_active_root.patch b/target/linux/lantiq/patches-4.9/0101-find_active_root.patch
index 7232ffa..73361c8 100644
--- a/target/linux/lantiq/patches-4.9/0101-find_active_root.patch
+++ b/target/linux/lantiq/patches-4.9/0101-find_active_root.patch
@@ -36,10 +36,10 @@
+ }
+}
+
- static int parse_ofpart_partitions(struct mtd_info *master,
- const struct mtd_partition **pparts,
- struct mtd_part_parser_data *data)
-@@ -36,7 +68,8 @@ static int parse_ofpart_partitions(struc
+ static int parse_fixed_partitions(struct mtd_info *master,
+ const struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+@@ -36,7 +68,8 @@ static int parse_fixed_partitions(struct
struct device_node *pp;
int nr_parts, i, ret = 0;
bool dedicated = true;
@@ -49,7 +49,7 @@
/* Pull of_node from the master device node */
mtd_node = mtd_get_of_node(master);
-@@ -72,7 +105,9 @@ static int parse_ofpart_partitions(struc
+@@ -72,7 +105,9 @@ static int parse_fixed_partitions(struct
return 0;
parts = kzalloc(nr_parts * sizeof(*parts), GFP_KERNEL);
@@ -60,7 +60,7 @@
return -ENOMEM;
i = 0;
-@@ -121,12 +156,22 @@ static int parse_ofpart_partitions(struc
+@@ -121,12 +156,22 @@ static int parse_fixed_partitions(struct
if (of_get_property(pp, "lock", &len))
parts[i].mask_flags |= MTD_POWERUP_LOCK;
diff --git a/target/linux/mvebu/patches-4.14/100-find_active_root.patch b/target/linux/mvebu/patches-4.14/100-find_active_root.patch
index 8a56347..f52a510 100644
--- a/target/linux/mvebu/patches-4.14/100-find_active_root.patch
+++ b/target/linux/mvebu/patches-4.14/100-find_active_root.patch
@@ -11,10 +11,10 @@ Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
+static int mangled_rootblock;
+
- static int parse_ofpart_partitions(struct mtd_info *master,
- const struct mtd_partition **pparts,
- struct mtd_part_parser_data *data)
-@@ -33,6 +35,7 @@ static int parse_ofpart_partitions(struc
+ static int parse_fixed_partitions(struct mtd_info *master,
+ const struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+@@ -33,6 +35,7 @@ static int parse_fixed_partitions(struct
struct device_node *mtd_node;
struct device_node *ofpart_node;
const char *partname;
@@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
struct device_node *pp;
int nr_parts, i, ret = 0;
bool dedicated = true;
-@@ -110,9 +113,13 @@ static int parse_ofpart_partitions(struc
+@@ -110,9 +113,13 @@ static int parse_fixed_partitions(struct
parts[i].size = of_read_number(reg + a_cells, s_cells);
parts[i].of_node = pp;
diff --git a/target/linux/mvebu/patches-4.9/100-find_active_root.patch b/target/linux/mvebu/patches-4.9/100-find_active_root.patch
index 4425aef..216af28 100644
--- a/target/linux/mvebu/patches-4.9/100-find_active_root.patch
+++ b/target/linux/mvebu/patches-4.9/100-find_active_root.patch
@@ -11,10 +11,10 @@ Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
+static int mangled_rootblock;
+
- static int parse_ofpart_partitions(struct mtd_info *master,
- const struct mtd_partition **pparts,
- struct mtd_part_parser_data *data)
-@@ -33,6 +35,7 @@ static int parse_ofpart_partitions(struc
+ static int parse_fixed_partitions(struct mtd_info *master,
+ const struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+@@ -33,6 +35,7 @@ static int parse_fixed_partitions(struct
struct device_node *mtd_node;
struct device_node *ofpart_node;
const char *partname;
@@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
struct device_node *pp;
int nr_parts, i, ret = 0;
bool dedicated = true;
-@@ -110,9 +113,13 @@ static int parse_ofpart_partitions(struc
+@@ -110,9 +113,13 @@ static int parse_fixed_partitions(struct
parts[i].size = of_read_number(reg + a_cells, s_cells);
parts[i].of_node = pp;
More information about the lede-commits
mailing list