diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-11-10 00:16:33 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-11-10 00:16:33 +0000 |
| commit | 5d4bbb5f5b15efc93c5b0a34fe7d66b074820167 (patch) | |
| tree | 60c167eea7506565a90125813fc1f2b181e0ac0a /target/linux/kirkwood/patches-3.18 | |
| parent | ad8f6370de1b67820a2b85feafc6abc6d6ce1992 (diff) | |
| download | upstream-5d4bbb5f5b15efc93c5b0a34fe7d66b074820167.tar.gz upstream-5d4bbb5f5b15efc93c5b0a34fe7d66b074820167.tar.bz2 upstream-5d4bbb5f5b15efc93c5b0a34fe7d66b074820167.zip | |
kirkwood: find active Linksys root partition
This is imported verbatim from the mvebu WRT1900AC port.
It picks up the current boot partition from the kernel command line,
then renames that partition "ubi" so that it auto-mounts.
Signed-off-by: Claudio Leite <leitec@staticky.com>
SVN-Revision: 47431
Diffstat (limited to 'target/linux/kirkwood/patches-3.18')
| -rw-r--r-- | target/linux/kirkwood/patches-3.18/100-find_active_root.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/kirkwood/patches-3.18/100-find_active_root.patch b/target/linux/kirkwood/patches-3.18/100-find_active_root.patch new file mode 100644 index 0000000000..e32b6089d1 --- /dev/null +++ b/target/linux/kirkwood/patches-3.18/100-find_active_root.patch @@ -0,0 +1,61 @@ +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,12 +25,15 @@ 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, + struct mtd_partition **pparts, + struct mtd_part_parser_data *data) + { + struct device_node *node; + const char *partname; ++ const char *owrtpart = "ubi"; + struct device_node *pp; + int nr_parts, i; + +@@ -78,9 +81,15 @@ static int parse_ofpart_partitions(struc + (*pparts)[i].offset = of_read_number(reg, a_cells); + (*pparts)[i].size = of_read_number(reg + a_cells, s_cells); + +- 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); ++ } ++ + (*pparts)[i].name = partname; + + if (of_get_property(pp, "read-only", &len)) +@@ -178,6 +187,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); |