projects
/
openwrt
/
staging
/
hauke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: support "linux,rootfs" DT property for splitting rootfs
[openwrt/staging/hauke.git]
/
target
/
linux
/
generic
/
pending-5.15
/
400-mtd-mtdsplit-support.patch
diff --git
a/target/linux/generic/pending-5.15/400-mtd-mtdsplit-support.patch
b/target/linux/generic/pending-5.15/400-mtd-mtdsplit-support.patch
index d07afd70ee00b1577af03a16c838f2c238e8ab81..bf82bb39506af9599e56ad38c2552b1bfebee3fa 100644
(file)
--- a/
target/linux/generic/pending-5.15/400-mtd-mtdsplit-support.patch
+++ b/
target/linux/generic/pending-5.15/400-mtd-mtdsplit-support.patch
@@
-66,7
+66,7
@@
Subject: [PATCH] mtd: mtdsplit support
/*
* MTD methods which simply translate the effective address and pass through
/*
* MTD methods which simply translate the effective address and pass through
-@@ -236,6 +238,14
6
@@ static int mtd_add_partition_attrs(struc
+@@ -236,6 +238,14
7
@@ static int mtd_add_partition_attrs(struc
return ret;
}
return ret;
}
@@
-198,7
+198,8
@@
Subject: [PATCH] mtd: mtdsplit support
+ if (rootfs_found)
+ return;
+
+ if (rootfs_found)
+ return;
+
-+ if (!strcmp(part->name, "rootfs")) {
++ if (of_find_property(mtd_get_of_node(part), "linux,rootfs", NULL) ||
++ !strcmp(part->name, "rootfs")) {
+ run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
+
+ rootfs_found = 1;
+ run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
+
+ rootfs_found = 1;
@@
-213,7
+214,7
@@
Subject: [PATCH] mtd: mtdsplit support
int mtd_add_partition(struct mtd_info *parent, const char *name,
long long offset, long long length)
{
int mtd_add_partition(struct mtd_info *parent, const char *name,
long long offset, long long length)
{
-@@ -274,6 +41
6
,7 @@ int mtd_add_partition(struct mtd_info *p
+@@ -274,6 +41
7
,7 @@ int mtd_add_partition(struct mtd_info *p
if (ret)
goto err_remove_part;
if (ret)
goto err_remove_part;
@@
-221,7
+222,7
@@
Subject: [PATCH] mtd: mtdsplit support
mtd_add_partition_attrs(child);
return 0;
mtd_add_partition_attrs(child);
return 0;
-@@ -422,6 +56
5
,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -422,6 +56
6
,7 @@ int add_mtd_partitions(struct mtd_info *
goto err_del_partitions;
}
goto err_del_partitions;
}
@@
-229,7
+230,7
@@
Subject: [PATCH] mtd: mtdsplit support
mtd_add_partition_attrs(child);
/* Look for subpartitions */
mtd_add_partition_attrs(child);
/* Look for subpartitions */
-@@ -438,31 +58
2
,6 @@ err_del_partitions:
+@@ -438,31 +58
3
,6 @@ err_del_partitions:
return ret;
}
return ret;
}