mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
9808b9ae02
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>
63 lines
1.7 KiB
Diff
63 lines
1.7 KiB
Diff
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);
|