From bf4aa52dbf9f4ecb4e48f815e30357976605a12a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 15 Mar 2018 00:42:41 +0100 Subject: [PATCH] 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 --- .../patches-4.9/202-linksys-find-active-root.patch | 10 +++++----- .../lantiq/patches-4.14/0101-find_active_root.patch | 12 ++++++------ .../lantiq/patches-4.9/0101-find_active_root.patch | 12 ++++++------ .../mvebu/patches-4.14/100-find_active_root.patch | 10 +++++----- .../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 cb705e60c0..f4156be4d1 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 +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 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 7232ffa416..73361c87fa 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 7232ffa416..73361c87fa 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 8a563474a7..f52a5108b8 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 +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 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 4425aef913..216af28c8d 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 +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 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; -- 2.30.2