aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-4.9/0101-find_active_root.patch
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-03-21 08:39:41 +0100
committerMathias Kresin <dev@kresin.me>2018-05-17 07:40:19 +0200
commitd7b7483343b5c7f157a2a97244ce9e60f4260e43 (patch)
tree75acc8b61427a13aed054ac48b1a284f80bfbf6a /target/linux/lantiq/patches-4.9/0101-find_active_root.patch
parent0678cc850ccc068ba33eb87f5f1bf8294a87e611 (diff)
downloadupstream-d7b7483343b5c7f157a2a97244ce9e60f4260e43.tar.gz
upstream-d7b7483343b5c7f157a2a97244ce9e60f4260e43.tar.bz2
upstream-d7b7483343b5c7f157a2a97244ce9e60f4260e43.zip
lantiq: switch to kernel 4.14
Use kernel 4.14 by default. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/lantiq/patches-4.9/0101-find_active_root.patch')
-rw-r--r--target/linux/lantiq/patches-4.9/0101-find_active_root.patch93
1 files changed, 0 insertions, 93 deletions
diff --git a/target/linux/lantiq/patches-4.9/0101-find_active_root.patch b/target/linux/lantiq/patches-4.9/0101-find_active_root.patch
deleted file mode 100644
index 73361c87fa..0000000000
--- a/target/linux/lantiq/patches-4.9/0101-find_active_root.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- a/drivers/mtd/ofpart.c
-+++ b/drivers/mtd/ofpart.c
-@@ -25,6 +25,38 @@ static bool node_has_compatible(struct d
- return of_get_property(pp, "compatible", NULL);
- }
-
-+static uint8_t * brnboot_get_selected_root_part(struct mtd_info *master,
-+ loff_t offset)
-+{
-+ static uint8_t root_id;
-+ int err, len;
-+
-+ err = mtd_read(master, offset, 0x01, &len, &root_id);
-+
-+ if (mtd_is_bitflip(err) || !err)
-+ return &root_id;
-+
-+ return NULL;
-+}
-+
-+static void brnboot_set_active_root_part(struct mtd_partition *pparts,
-+ struct device_node **part_nodes,
-+ int nr_parts,
-+ uint8_t *root_id)
-+{
-+ int i;
-+
-+ for (i = 0; i < nr_parts; i++) {
-+ int part_root_id;
-+
-+ if (!of_property_read_u32(part_nodes[i], "brnboot,root-id", &part_root_id)
-+ && part_root_id == *root_id) {
-+ pparts[i].name = "firmware";
-+ break;
-+ }
-+ }
-+}
-+
- static int parse_fixed_partitions(struct mtd_info *master,
- const struct mtd_partition **pparts,
- struct mtd_part_parser_data *data)
-@@ -36,7 +68,8 @@ static int parse_fixed_partitions(struct
- struct device_node *pp;
- int nr_parts, i, ret = 0;
- bool dedicated = true;
--
-+ uint8_t *proot_id = NULL;
-+ struct device_node **part_nodes;
-
- /* Pull of_node from the master device node */
- mtd_node = mtd_get_of_node(master);
-@@ -72,7 +105,9 @@ static int parse_fixed_partitions(struct
- return 0;
-
- parts = kzalloc(nr_parts * sizeof(*parts), GFP_KERNEL);
-- if (!parts)
-+ part_nodes = kzalloc(nr_parts * sizeof(*part_nodes), GFP_KERNEL);
-+
-+ if (!parts || !part_nodes)
- return -ENOMEM;
-
- i = 0;
-@@ -121,12 +156,22 @@ static int parse_fixed_partitions(struct
- if (of_get_property(pp, "lock", &len))
- parts[i].mask_flags |= MTD_POWERUP_LOCK;
-
-+ if (!proot_id && of_device_is_compatible(pp, "brnboot,root-selector"))
-+ proot_id = brnboot_get_selected_root_part(master, parts[i].offset);
-+
-+ part_nodes[i] = pp;
-+
- i++;
- }
-
- if (!nr_parts)
- goto ofpart_none;
-
-+ if (proot_id)
-+ brnboot_set_active_root_part(parts, part_nodes, nr_parts, proot_id);
-+
-+ kfree(part_nodes);
-+
- *pparts = parts;
- return nr_parts;
-
-@@ -137,6 +182,7 @@ ofpart_fail:
- ofpart_none:
- of_node_put(pp);
- kfree(parts);
-+ kfree(part_nodes);
- return ret;
- }
-