diff options
| author | Paul Wassi <p.wassi@gmx.at> | 2018-12-27 15:39:36 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-02-17 19:22:39 +0100 |
| commit | d42c9ce326aaf8eb0eeb0fd944eb5905cec4be4a (patch) | |
| tree | 5df7fcb6164a7bb5ecdfdbd66178123e2e9deda7 /target/linux/kirkwood/patches-4.19/202-linksys-find-active-root.patch | |
| parent | 66e875a07033cdcfd8c4a16940d4acfe63c60202 (diff) | |
| download | upstream-d42c9ce326aaf8eb0eeb0fd944eb5905cec4be4a.tar.gz upstream-d42c9ce326aaf8eb0eeb0fd944eb5905cec4be4a.tar.bz2 upstream-d42c9ce326aaf8eb0eeb0fd944eb5905cec4be4a.zip | |
kirkwood: add kernel 4.19 support
Add patches for 4.19
Drop patch 200-disable-tso, as the packet corruption was fixed in
kernel commit 3b89624ab54b9dc2d92fc08ce2670e5f19ad8ec8
Restructure the DTS for Marvell switch in 104-ea3500 and 105-ea4500
to fix DTC warning.
Signed-off-by: Paul Wassi <p.wassi@gmx.at>
Diffstat (limited to 'target/linux/kirkwood/patches-4.19/202-linksys-find-active-root.patch')
| -rw-r--r-- | target/linux/kirkwood/patches-4.19/202-linksys-find-active-root.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/target/linux/kirkwood/patches-4.19/202-linksys-find-active-root.patch b/target/linux/kirkwood/patches-4.19/202-linksys-find-active-root.patch new file mode 100644 index 0000000000..860d7b0728 --- /dev/null +++ b/target/linux/kirkwood/patches-4.19/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_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); |