aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood/patches-4.14/202-linksys-find-active-root.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-28 11:52:40 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-28 16:49:31 +0200
commit0af2c44604e64617bfb8084da2021e557160a5da (patch)
treeaa2e3d96c07da5b4a622d968fc55e11a2233bc29 /target/linux/kirkwood/patches-4.14/202-linksys-find-active-root.patch
parent4fd7e539e4f90128bdd7cb71c729a4b32f5de86e (diff)
downloadupstream-0af2c44604e64617bfb8084da2021e557160a5da.tar.gz
upstream-0af2c44604e64617bfb8084da2021e557160a5da.tar.bz2
upstream-0af2c44604e64617bfb8084da2021e557160a5da.zip
kirkwood: remove support for kernel 4.14
kirkwood has moved to DSA on 5.4, which will make kernel 4.14 and 4.19 support broken on the affected devices. Support on kernel 5.4 seems to have been running fine for almost 2 months on multiple devices. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Pawel Dembicki <paweldembicki@gmail.com>
Diffstat (limited to 'target/linux/kirkwood/patches-4.14/202-linksys-find-active-root.patch')
-rw-r--r--target/linux/kirkwood/patches-4.14/202-linksys-find-active-root.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/target/linux/kirkwood/patches-4.14/202-linksys-find-active-root.patch b/target/linux/kirkwood/patches-4.14/202-linksys-find-active-root.patch
deleted file mode 100644
index 860d7b0728..0000000000
--- a/target/linux/kirkwood/patches-4.14/202-linksys-find-active-root.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-The WRT1900AC among other Linksys routers uses a dual-firmware layout.
-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
- return of_get_property(pp, "compatible", NULL);
- }
-
-+static int mangled_rootblock;
-+
- 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;
-+ const char *owrtpart = "ubi";
- const char *partname;
- struct device_node *pp;
- int nr_parts, i, ret = 0;
-@@ -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;
-
-- partname = of_get_property(pp, "label", &len);
-- if (!partname)
-- partname = of_get_property(pp, "name", &len);
-+ if (mangled_rootblock && (i == mangled_rootblock)) {
-+ partname = owrtpart;
-+ } else {
-+ partname = of_get_property(pp, "label", &len);
-+
-+ if (!partname)
-+ partname = of_get_property(pp, "name", &len);
-+ }
-+
- parts[i].name = partname;
-
- if (of_get_property(pp, "read-only", &len))
-@@ -219,6 +228,18 @@ static int __init ofpart_parser_init(voi
- return 0;
- }
-
-+static int __init active_root(char *str)
-+{
-+ get_option(&str, &mangled_rootblock);
-+
-+ if (!mangled_rootblock)
-+ return 1;
-+
-+ return 1;
-+}
-+
-+__setup("mangled_rootblock=", active_root);
-+
- static void __exit ofpart_parser_exit(void)
- {
- deregister_mtd_parser(&ofpart_parser);