From 3fd0a4222b6efbfbdb560c5b13e899ecda627494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 29 Mar 2021 08:16:17 +0200 Subject: kernel: backport 5.13 mtd partitioning changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Use upstream accepted NVMEM patches 2. Minor fix for BCM4908 partitioning 3. Support for Linksys firmware partitions on Northstar Signed-off-by: Rafał Miłecki --- target/linux/mvebu/patches-5.10/400-find_active_root.patch | 8 ++++---- target/linux/mvebu/patches-5.4/400-find_active_root.patch | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'target/linux/mvebu') diff --git a/target/linux/mvebu/patches-5.10/400-find_active_root.patch b/target/linux/mvebu/patches-5.10/400-find_active_root.patch index 6146c8e038..63b4c48dcf 100644 --- a/target/linux/mvebu/patches-5.10/400-find_active_root.patch +++ b/target/linux/mvebu/patches-5.10/400-find_active_root.patch @@ -5,7 +5,7 @@ Signed-off-by: Imre Kaloz --- a/drivers/mtd/parsers/ofpart_core.c +++ b/drivers/mtd/parsers/ofpart_core.c -@@ -33,6 +33,8 @@ static bool node_has_compatible(struct d +@@ -38,6 +38,8 @@ static bool node_has_compatible(struct d return of_get_property(pp, "compatible", NULL); } @@ -14,7 +14,7 @@ Signed-off-by: Imre Kaloz static int parse_fixed_partitions(struct mtd_info *master, const struct mtd_partition **pparts, struct mtd_part_parser_data *data) -@@ -43,6 +45,7 @@ static int parse_fixed_partitions(struct +@@ -48,6 +50,7 @@ static int parse_fixed_partitions(struct struct device_node *mtd_node; struct device_node *ofpart_node; const char *partname; @@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz struct device_node *pp; int nr_parts, i, ret = 0; bool dedicated = true; -@@ -126,9 +129,13 @@ static int parse_fixed_partitions(struct +@@ -131,9 +134,13 @@ static int parse_fixed_partitions(struct parts[i].size = of_read_number(reg + a_cells, s_cells); parts[i].of_node = pp; @@ -39,7 +39,7 @@ Signed-off-by: Imre Kaloz parts[i].name = partname; if (of_get_property(pp, "read-only", &len)) -@@ -244,6 +251,18 @@ static int __init ofpart_parser_init(voi +@@ -250,6 +257,18 @@ static int __init ofpart_parser_init(voi return 0; } diff --git a/target/linux/mvebu/patches-5.4/400-find_active_root.patch b/target/linux/mvebu/patches-5.4/400-find_active_root.patch index 6ac777a1d2..3bdb1eab8f 100644 --- a/target/linux/mvebu/patches-5.4/400-find_active_root.patch +++ b/target/linux/mvebu/patches-5.4/400-find_active_root.patch @@ -5,7 +5,7 @@ Signed-off-by: Imre Kaloz --- a/drivers/mtd/parsers/ofpart_core.c +++ b/drivers/mtd/parsers/ofpart_core.c -@@ -33,6 +33,8 @@ static bool node_has_compatible(struct d +@@ -38,6 +38,8 @@ static bool node_has_compatible(struct d return of_get_property(pp, "compatible", NULL); } @@ -14,7 +14,7 @@ Signed-off-by: Imre Kaloz static int parse_fixed_partitions(struct mtd_info *master, const struct mtd_partition **pparts, struct mtd_part_parser_data *data) -@@ -43,6 +45,7 @@ static int parse_fixed_partitions(struct +@@ -48,6 +50,7 @@ static int parse_fixed_partitions(struct struct device_node *mtd_node; struct device_node *ofpart_node; const char *partname; @@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz struct device_node *pp; int nr_parts, i, ret = 0; bool dedicated = true; -@@ -126,9 +129,13 @@ static int parse_fixed_partitions(struct +@@ -131,9 +134,13 @@ static int parse_fixed_partitions(struct parts[i].size = of_read_number(reg + a_cells, s_cells); parts[i].of_node = pp; @@ -39,7 +39,7 @@ Signed-off-by: Imre Kaloz parts[i].name = partname; if (of_get_property(pp, "read-only", &len)) -@@ -241,6 +248,18 @@ static int __init ofpart_parser_init(voi +@@ -247,6 +254,18 @@ static int __init ofpart_parser_init(voi return 0; } -- cgit v1.2.3