aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/400-mtd-add-rootfs-split-support.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-08-17 06:17:37 +0000
committerJohn Crispin <john@openwrt.org>2015-08-17 06:17:37 +0000
commit6856535e290aefcebd257b19a6b7d8d9c70c1171 (patch)
treee75734c6f31448927dacf3c9975396af3ba1377f /target/linux/generic/patches-4.1/400-mtd-add-rootfs-split-support.patch
parente83643d31c2364166f411e7a1bb8c183489705c0 (diff)
downloadupstream-6856535e290aefcebd257b19a6b7d8d9c70c1171.tar.gz
upstream-6856535e290aefcebd257b19a6b7d8d9c70c1171.tar.bz2
upstream-6856535e290aefcebd257b19a6b7d8d9c70c1171.zip
kernel: move linux, part-probe dt parsing in generic code
The "linux,part-probe" dts parsing is a pretty neat generic feature. It has been posted to kernel.org and could easily be reused by all targets. This change moves the patch to the 3.18 and 4.1 generic folders, and makes the feature available to all platforms who may want to use it. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46654
Diffstat (limited to 'target/linux/generic/patches-4.1/400-mtd-add-rootfs-split-support.patch')
-rw-r--r--target/linux/generic/patches-4.1/400-mtd-add-rootfs-split-support.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/target/linux/generic/patches-4.1/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/patches-4.1/400-mtd-add-rootfs-split-support.patch
index cbc2325d84..ba64e093a9 100644
--- a/target/linux/generic/patches-4.1/400-mtd-add-rootfs-split-support.patch
+++ b/target/linux/generic/patches-4.1/400-mtd-add-rootfs-split-support.patch
@@ -26,11 +26,12 @@
depends on m
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -29,10 +29,12 @@
+@@ -29,11 +29,13 @@
#include <linux/kmod.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
+#include <linux/magic.h>
+ #include <linux/of.h>
#include <linux/err.h>
#include <linux/kconfig.h>
@@ -39,7 +40,7 @@
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
-@@ -46,13 +48,14 @@ struct mtd_part {
+@@ -47,13 +49,14 @@ struct mtd_part {
struct list_head list;
};
@@ -55,7 +56,7 @@
/*
* MTD methods which simply translate the effective address and pass through
* to the _real_ device.
-@@ -578,8 +581,10 @@ static int mtd_add_partition_attrs(struc
+@@ -579,8 +582,10 @@ static int mtd_add_partition_attrs(struc
return ret;
}
@@ -68,7 +69,7 @@
{
struct mtd_partition part;
struct mtd_part *new;
-@@ -611,6 +616,7 @@ int mtd_add_partition(struct mtd_info *m
+@@ -612,6 +617,7 @@ int mtd_add_partition(struct mtd_info *m
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&new->mtd);
@@ -76,7 +77,7 @@
mtd_add_partition_attrs(new);
-@@ -618,6 +624,12 @@ int mtd_add_partition(struct mtd_info *m
+@@ -619,6 +625,12 @@ int mtd_add_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_add_partition);
@@ -89,7 +90,7 @@
int mtd_del_partition(struct mtd_info *master, int partno)
{
struct mtd_part *slave, *next;
-@@ -643,6 +655,35 @@ int mtd_del_partition(struct mtd_info *m
+@@ -644,6 +656,35 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -125,7 +126,7 @@
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -672,6 +713,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -673,6 +714,7 @@ int add_mtd_partitions(struct mtd_info *
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&slave->mtd);