diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-15 00:42:41 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-15 00:42:41 +0100 |
| commit | bf4aa52dbf9f4ecb4e48f815e30357976605a12a (patch) | |
| tree | fa2accb7f67fc9a7cea76503138b4432f7791842 /target/linux/lantiq | |
| parent | 4943afd7818f56053231a5a7ae90e55da44f1f08 (diff) | |
| download | upstream-bf4aa52dbf9f4ecb4e48f815e30357976605a12a.tar.gz upstream-bf4aa52dbf9f4ecb4e48f815e30357976605a12a.tar.bz2 upstream-bf4aa52dbf9f4ecb4e48f815e30357976605a12a.zip | |
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@hauke-m.de>
Diffstat (limited to 'target/linux/lantiq')
| -rw-r--r-- | target/linux/lantiq/patches-4.14/0101-find_active_root.patch | 12 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-4.9/0101-find_active_root.patch | 12 |
2 files changed, 12 insertions, 12 deletions
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; |