X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c5552ad03973839d83d32d7108f20c00f192633b..a82d9221c9ccfe1260a62fe816ca24625b0b9a7a:/target/linux/generic/patches-2.6.30/065-rootfs_split.patch?ds=sidebyside

diff --git a/target/linux/generic/patches-2.6.30/065-rootfs_split.patch b/target/linux/generic/patches-2.6.30/065-rootfs_split.patch
index 34c1f5add..24aad52ef 100644
--- a/target/linux/generic/patches-2.6.30/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.30/065-rootfs_split.patch
@@ -37,7 +37,7 @@
  
  /*
   * MTD methods which simply translate the effective address and pass through
-@@ -512,6 +514,155 @@ out_register:
+@@ -512,6 +514,157 @@ out_register:
  	return slave;
  }
  
@@ -93,10 +93,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;
 +
@@ -114,7 +116,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)
@@ -193,7 +195,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
-@@ -527,14 +678,29 @@ int add_mtd_partitions(struct mtd_info *
+@@ -527,14 +680,29 @@ int add_mtd_partitions(struct mtd_info *
  {
  	struct mtd_part *slave;
  	uint64_t cur_offset = 0;
@@ -226,7 +228,7 @@
  		cur_offset = slave->offset + slave->mtd.size;
  	}
  
-@@ -542,6 +708,32 @@ int add_mtd_partitions(struct mtd_info *
+@@ -542,6 +710,32 @@ int add_mtd_partitions(struct mtd_info *
  }
  EXPORT_SYMBOL(add_mtd_partitions);
  
@@ -627,7 +629,7 @@
  #define ECCGETLAYOUT		_IOR('M', 17, struct nand_ecclayout)
  #define ECCGETSTATS		_IOR('M', 18, struct mtd_ecc_stats)
  #define MTDFILEMODE		_IO('M', 19)
-+#define MTDREFRESH		_IO('M', 23)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace