aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch
diff options
context:
space:
mode:
authorPawel Dembicki <paweldembicki@gmail.com>2020-03-02 21:42:34 +0100
committerPetr Štetiar <ynezz@true.cz>2020-03-03 23:38:23 +0100
commit45e47a9cd7b8ad5572eedb7ed5befec553a3f04d (patch)
treeefc6a3bdae9b0332701e99cece83a73e77f20733 /target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch
parent43a1767afbc80edab6c77f3cfd86c7a72556d75d (diff)
downloadupstream-45e47a9cd7b8ad5572eedb7ed5befec553a3f04d.tar.gz
upstream-45e47a9cd7b8ad5572eedb7ed5befec553a3f04d.tar.bz2
upstream-45e47a9cd7b8ad5572eedb7ed5befec553a3f04d.zip
kirkwood: initial refresh of 5.4 patches
Refreshed all patches. Changed: 105-ea4500.patch-> Upstream DSA driver was updated. Patch was fixed 202-linksys-find-active-root.patch -> Upstream driver was moved. Patch was fixed Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
Diffstat (limited to 'target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch')
-rw-r--r--target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch b/target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch
index 860d7b0728..b7e7f50271 100644
--- a/target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch
+++ b/target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch
@@ -3,9 +3,9 @@ Dynamically rename the active partition to "ubi".
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
---- a/drivers/mtd/ofpart.c
-+++ b/drivers/mtd/ofpart.c
-@@ -25,6 +25,8 @@ static bool node_has_compatible(struct d
+--- a/drivers/mtd/parsers/ofpart.c
++++ b/drivers/mtd/parsers/ofpart.c
+@@ -21,6 +21,8 @@ static bool node_has_compatible(struct d
return of_get_property(pp, "compatible", NULL);
}
@@ -14,7 +14,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
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
+@@ -28,6 +30,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@openwrt.org>
const char *partname;
struct device_node *pp;
int nr_parts, i, ret = 0;
-@@ -110,9 +113,15 @@ static int parse_fixed_partitions(struct
+@@ -106,9 +109,15 @@ static int parse_fixed_partitions(struct
parts[i].size = of_read_number(reg + a_cells, s_cells);
parts[i].of_node = pp;
@@ -41,7 +41,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
parts[i].name = partname;
if (of_get_property(pp, "read-only", &len))
-@@ -219,6 +228,18 @@ static int __init ofpart_parser_init(voi
+@@ -215,6 +224,18 @@ static int __init ofpart_parser_init(voi
return 0;
}