KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: make mtd patches apply again

Browse source 
This makes some of the mtd patches apply again after some generic
patches were changed.
These problems where found by build bot.

Fixes: ac9bcefa3b ("kernel: use V10 of mtd patchset adding support for "compatible" string")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2018-03-15 00:42:41 +01:00
parent 4943afd781
commit bf4aa52dbf
5 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch
View file

@ -11,10 +11,10 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+static int mangled_rootblock; +static int mangled_rootblock;
+ +
static int parse_ofpart_partitions(struct mtd_info *master, static int parse_fixed_partitions(struct mtd_info *master,
const struct mtd_partition **pparts, const struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
@@ -32,6 +34,7 @@ static int parse_ofpart_partitions(struc @@ -32,6 +34,7 @@ static int parse_fixed_partitions(struct
struct mtd_partition *parts; struct mtd_partition *parts;
struct device_node *mtd_node; struct device_node *mtd_node;
struct device_node *ofpart_node; struct device_node *ofpart_node;
@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
const char *partname; const char *partname;
struct device_node *pp; struct device_node *pp;
int nr_parts, i, ret = 0; 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].size = of_read_number(reg + a_cells, s_cells);
parts[i].of_node = pp; parts[i].of_node = pp;

12
target/linux/lantiq/patches-4.14/0101-find_active_root.patch
View file

@ -36,10 +36,10 @@
+ } + }
+} +}
+ +
static int parse_ofpart_partitions(struct mtd_info *master, static int parse_fixed_partitions(struct mtd_info *master,
const struct mtd_partition **pparts, const struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
@@ -36,7 +68,8 @@ static int parse_ofpart_partitions(struc @@ -36,7 +68,8 @@ static int parse_fixed_partitions(struct
struct device_node *pp; struct device_node *pp;
int nr_parts, i, ret = 0; int nr_parts, i, ret = 0;
bool dedicated = true; bool dedicated = true;
@ -49,7 +49,7 @@
/* Pull of_node from the master device node */ /* Pull of_node from the master device node */
mtd_node = mtd_get_of_node(master); 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; return 0;
parts = kzalloc(nr_parts * sizeof(*parts), GFP_KERNEL); parts = kzalloc(nr_parts * sizeof(*parts), GFP_KERNEL);
@ -60,7 +60,7 @@
return -ENOMEM; return -ENOMEM;
i = 0; 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)) if (of_get_property(pp, "lock", &len))
parts[i].mask_flags |= MTD_POWERUP_LOCK; parts[i].mask_flags |= MTD_POWERUP_LOCK;

12
target/linux/lantiq/patches-4.9/0101-find_active_root.patch
View file

@ -36,10 +36,10 @@
+ } + }
+} +}
+ +
static int parse_ofpart_partitions(struct mtd_info *master, static int parse_fixed_partitions(struct mtd_info *master,
const struct mtd_partition **pparts, const struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
@@ -36,7 +68,8 @@ static int parse_ofpart_partitions(struc @@ -36,7 +68,8 @@ static int parse_fixed_partitions(struct
struct device_node *pp; struct device_node *pp;
int nr_parts, i, ret = 0; int nr_parts, i, ret = 0;
bool dedicated = true; bool dedicated = true;
@ -49,7 +49,7 @@
/* Pull of_node from the master device node */ /* Pull of_node from the master device node */
mtd_node = mtd_get_of_node(master); 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; return 0;
parts = kzalloc(nr_parts * sizeof(*parts), GFP_KERNEL); parts = kzalloc(nr_parts * sizeof(*parts), GFP_KERNEL);
@ -60,7 +60,7 @@
return -ENOMEM; return -ENOMEM;
i = 0; 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)) if (of_get_property(pp, "lock", &len))
parts[i].mask_flags |= MTD_POWERUP_LOCK; parts[i].mask_flags |= MTD_POWERUP_LOCK;

10
target/linux/mvebu/patches-4.14/100-find_active_root.patch
View file

@ -11,10 +11,10 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+static int mangled_rootblock; +static int mangled_rootblock;
+ +
static int parse_ofpart_partitions(struct mtd_info *master, static int parse_fixed_partitions(struct mtd_info *master,
const struct mtd_partition **pparts, const struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
@@ -33,6 +35,7 @@ static int parse_ofpart_partitions(struc @@ -33,6 +35,7 @@ static int parse_fixed_partitions(struct
struct device_node *mtd_node; struct device_node *mtd_node;
struct device_node *ofpart_node; struct device_node *ofpart_node;
const char *partname; const char *partname;
@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
struct device_node *pp; struct device_node *pp;
int nr_parts, i, ret = 0; int nr_parts, i, ret = 0;
bool dedicated = true; 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].size = of_read_number(reg + a_cells, s_cells);
parts[i].of_node = pp; parts[i].of_node = pp;

10
target/linux/mvebu/patches-4.9/100-find_active_root.patch
View file

@ -11,10 +11,10 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+static int mangled_rootblock; +static int mangled_rootblock;
+ +
static int parse_ofpart_partitions(struct mtd_info *master, static int parse_fixed_partitions(struct mtd_info *master,
const struct mtd_partition **pparts, const struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
@@ -33,6 +35,7 @@ static int parse_ofpart_partitions(struc @@ -33,6 +35,7 @@ static int parse_fixed_partitions(struct
struct device_node *mtd_node; struct device_node *mtd_node;
struct device_node *ofpart_node; struct device_node *ofpart_node;
const char *partname; const char *partname;
@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
struct device_node *pp; struct device_node *pp;
int nr_parts, i, ret = 0; int nr_parts, i, ret = 0;
bool dedicated = true; 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].size = of_read_number(reg + a_cells, s_cells);
parts[i].of_node = pp; parts[i].of_node = pp;