mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
7a7b2fd809
This adds the latest version of ofpart commit. It hopefully 1. Doesn't break compilation 2. Doesn't break partitioning (this time). It's required to implement fixed partitioning with some quirks. It's required by bcm53xx, bcm4908, kirkwood, lantiq and mvebu. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
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/parsers/ofpart_core.c
|
|
+++ b/drivers/mtd/parsers/ofpart_core.c
|
|
@@ -33,6 +33,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)
|
|
@@ -42,6 +44,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;
|
|
@@ -124,9 +127,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))
|
|
@@ -242,6 +251,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);
|