summaryrefslogtreecommitdiff
path: root/target/linux/mvebu/patches-4.1/100-find_active_root.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-20 14:36:51 +0200
committerFelix Fietkau <nbd@nbd.name>2016-05-20 14:38:10 +0200
commit24b8d31badc276c5c532995c523a2c7c898be497 (patch)
tree9864d789dcaaecde77989f4d5d9a4762e069b478 /target/linux/mvebu/patches-4.1/100-find_active_root.patch
parent8eab383782d94c3a0c68c81e8a345ce450923f8c (diff)
downloadmtk-20170518-24b8d31badc276c5c532995c523a2c7c898be497.zip
mtk-20170518-24b8d31badc276c5c532995c523a2c7c898be497.tar.gz
mtk-20170518-24b8d31badc276c5c532995c523a2c7c898be497.tar.bz2
mvebu: update to linux 4.4
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/mvebu/patches-4.1/100-find_active_root.patch')
-rw-r--r--target/linux/mvebu/patches-4.1/100-find_active_root.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/target/linux/mvebu/patches-4.1/100-find_active_root.patch b/target/linux/mvebu/patches-4.1/100-find_active_root.patch
deleted file mode 100644
index e32b608..0000000
--- a/target/linux/mvebu/patches-4.1/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);