tools: mkimage: provide dtc path during build
[openwrt/openwrt.git] / target / linux / mvebu / patches-4.9 / 100-find_active_root.patch
1 The WRT1900AC among other Linksys routers uses a dual-firmware layout.
2 Dynamically rename the active partition to "ubi".
3
4 Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
5
6 --- a/drivers/mtd/ofpart.c
7 +++ b/drivers/mtd/ofpart.c
8 @@ -25,6 +25,8 @@ static bool node_has_compatible(struct d
9 return of_get_property(pp, "compatible", NULL);
10 }
11
12 +static int mangled_rootblock;
13 +
14 static int parse_fixed_partitions(struct mtd_info *master,
15 const struct mtd_partition **pparts,
16 struct mtd_part_parser_data *data)
17 @@ -33,6 +35,7 @@ static int parse_fixed_partitions(struct
18 struct device_node *mtd_node;
19 struct device_node *ofpart_node;
20 const char *partname;
21 + const char *owrtpart = "ubi";
22 struct device_node *pp;
23 int nr_parts, i, ret = 0;
24 bool dedicated = true;
25 @@ -110,9 +113,13 @@ static int parse_fixed_partitions(struct
26 parts[i].size = of_read_number(reg + a_cells, s_cells);
27 parts[i].of_node = pp;
28
29 - partname = of_get_property(pp, "label", &len);
30 - if (!partname)
31 - partname = of_get_property(pp, "name", &len);
32 + if (mangled_rootblock && (i == mangled_rootblock)) {
33 + partname = owrtpart;
34 + } else {
35 + partname = of_get_property(pp, "label", &len);
36 + if (!partname)
37 + partname = of_get_property(pp, "name", &len);
38 + }
39 parts[i].name = partname;
40
41 if (of_get_property(pp, "read-only", &len))
42 @@ -220,6 +227,18 @@ static int __init ofpart_parser_init(voi
43 return 0;
44 }
45
46 +static int __init active_root(char *str)
47 +{
48 + get_option(&str, &mangled_rootblock);
49 +
50 + if (!mangled_rootblock)
51 + return 1;
52 +
53 + return 1;
54 +}
55 +
56 +__setup("mangled_rootblock=", active_root);
57 +
58 static void __exit ofpart_parser_exit(void)
59 {
60 deregister_mtd_parser(&ofpart_parser);