diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-12-11 13:38:21 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-12-11 13:38:21 +0000 |
commit | 3357033b7388819106bc042bfe94f9a6ea7c81fa (patch) | |
tree | e33165365607618fdba211c9a9c4a1d46b6be43a /target/linux/mvebu/patches-4.0/100-find_active_root.patch | |
parent | 58e9e35444514781a6e52e6187a1fea815788683 (diff) | |
download | upstream-3357033b7388819106bc042bfe94f9a6ea7c81fa.tar.gz upstream-3357033b7388819106bc042bfe94f9a6ea7c81fa.tar.bz2 upstream-3357033b7388819106bc042bfe94f9a6ea7c81fa.zip |
mvebu: drop support for old kernels
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 47835
Diffstat (limited to 'target/linux/mvebu/patches-4.0/100-find_active_root.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.0/100-find_active_root.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/target/linux/mvebu/patches-4.0/100-find_active_root.patch b/target/linux/mvebu/patches-4.0/100-find_active_root.patch deleted file mode 100644 index e32b6089d1..0000000000 --- a/target/linux/mvebu/patches-4.0/100-find_active_root.patch +++ /dev/null @@ -1,61 +0,0 @@ -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); |