aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.39
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-17 18:32:28 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-17 18:32:28 +0000
commitd49cb1d62ff86c4a2fa256a61c328110978f3d42 (patch)
treea1155dec82f4b85eae6aecfc37443bc6040b7056 /target/linux/generic/patches-2.6.39
parent6431cd0853b861849a2d095e29fa1bc793178a7f (diff)
downloadupstream-d49cb1d62ff86c4a2fa256a61c328110978f3d42.tar.gz
upstream-d49cb1d62ff86c4a2fa256a61c328110978f3d42.tar.bz2
upstream-d49cb1d62ff86c4a2fa256a61c328110978f3d42.zip
rootfs_split: Allow using MTDPART_OFS_APPEND macro for offset of rootfs.
Use offset from struct mtd_part instead of struct mtd_partition for defining the new partitions. This enables the usage of MTDPART_OFS_APPEND macro in struct mtd_partition. Signed-off-by: Jochen Friedrich <jochen@scram.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26705 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.39')
-rw-r--r--target/linux/generic/patches-2.6.39/400-rootfs_split.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.39/400-rootfs_split.patch b/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
index 45072bab22..b41c740cc8 100644
--- a/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
@@ -37,7 +37,7 @@
/*
* MTD methods which simply translate the effective address and pass through
-@@ -636,6 +638,153 @@ int mtd_del_partition(struct mtd_info *m
+@@ -636,6 +638,155 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -92,9 +92,11 @@
+{
+ struct mtd_partition *dpart;
+ struct mtd_part *slave = NULL;
++ struct mtd_part *spart;
+ int ret, split_offset = 0;
+
-+ ret = split_squashfs(master, part->offset, &split_offset);
++ spart = PART(rpart);
++ ret = split_squashfs(master, spart->offset, &split_offset);
+ if (ret)
+ return ret;
+
@@ -112,7 +114,7 @@
+ dpart->name = (unsigned char *)&dpart[1];
+ strcpy(dpart->name, ROOTFS_SPLIT_NAME);
+
-+ dpart->size -= split_offset - dpart->offset;
++ dpart->size = rpart->size - (split_offset - spart->offset);
+ dpart->offset = split_offset;
+
+ if (dpart == NULL)