domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rootfs_split: Allow using MTDPART_OFS_APPEND macro for offset of rootfs.

Browse Source 
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>

SVN-Revision: 26705
This commit is contained in:
Felix Fietkau
2011-04-17 18:32:28 +00:00
parent 5a0df036b0
commit ede6b0d360
7 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/generic/patches-2.6.32/065-rootfs_split.patch
View File

@@ -37,7 +37,7 @@
/*
* MTD methods which simply translate the effective address and pass through
@@ -503,6 +505,150 @@ out_register:
@@ -503,6 +505,152 @@ out_register:
return slave;
}
@@ -92,10 +92,12 @@
+{
+ struct mtd_partition *dpart;
+ struct mtd_part *slave = NULL;
+ struct mtd_part *spart;
+ int split_offset = 0;
+ int ret;
+
+ ret = split_squashfs(master, part->offset, &split_offset);
+ spart = PART(rpart);
+ ret = split_squashfs(master, spart->offset, &split_offset);
+ if (ret)
+ return ret;
+
@@ -113,7 +115,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)
@@ -188,7 +190,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
@@ -518,7 +664,7 @@ int add_mtd_partitions(struct mtd_info *
@@ -518,7 +666,7 @@ int add_mtd_partitions(struct mtd_info *
{
struct mtd_part *slave;
uint64_t cur_offset = 0;
@@ -197,7 +199,7 @@
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
@@ -526,6 +672,21 @@ int add_mtd_partitions(struct mtd_info *
@@ -526,6 +674,21 @@ int add_mtd_partitions(struct mtd_info *
slave = add_one_partition(master, parts + i, i, cur_offset);
if (!slave)
return -ENOMEM;
@@ -219,7 +221,7 @@
cur_offset = slave->offset + slave->mtd.size;
}
@@ -533,6 +694,32 @@ int add_mtd_partitions(struct mtd_info *
@@ -533,6 +696,32 @@ int add_mtd_partitions(struct mtd_info *
}
EXPORT_SYMBOL(add_mtd_partitions);