aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch
diff options
context:
space:
mode:
authorPaul Wassi <p.wassi@gmx.at>2017-03-10 19:10:29 +0100
committerMathias Kresin <dev@kresin.me>2017-07-04 16:29:07 +0200
commit9808b9ae0248f0e2b525493f10752b2b9fc9fde4 (patch)
tree49c36ed203fd79d89e06a5e1cf833e469d2a236c /target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch
parent08c499f865a1a42ed50e70c8ff68b9916a5033f1 (diff)
downloadupstream-9808b9ae0248f0e2b525493f10752b2b9fc9fde4.tar.gz
upstream-9808b9ae0248f0e2b525493f10752b2b9fc9fde4.tar.bz2
upstream-9808b9ae0248f0e2b525493f10752b2b9fc9fde4.zip
kirkwood: switch to kernel 4.9
Add patches-4.9, some of them (heavily) rewritten: - ea4500 is upstream available, keep only LEDE changes in dts - ea3500 is changed to match the structure of the upstream ea4500 dts - nsa310s rewritten to include the common dtsi - nsa325 is dropped, since already upstream Signed-off-by: Paul Wassi <p.wassi@gmx.at> Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it> [refresh kernel config, add on100, use the switchdev based mv88e6171 driver for the linksys boards, keep lede specific rootfs/kernel partition names for linksys boards, reorder patches] Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch')
-rw-r--r--target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch62
1 files changed, 62 insertions, 0 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
new file mode 100644
index 0000000000..28fc153bda
--- /dev/null
+++ b/target/linux/kirkwood/patches-4.9/202-linksys-find-active-root.patch
@@ -0,0 +1,62 @@
+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_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
+ 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_ofpart_partitions(struc
+ 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))
+@@ -213,6 +222,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);