From 243c6a32aab4031e0f0c7324cd3bef6a37d280e1 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 30 Jun 2005 23:01:09 +0100
Subject: [PATCH] --- yaml --- r: 4048 b: refs/heads/master c:
 747aead34de65c25765da79825ce2c08d8257b10 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/mtd/afs.c | 16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index bb39570679fa..aa762f4d828e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abaf48a05a8f097654e746af2a5afb2ab95861a1
+refs/heads/master: 747aead34de65c25765da79825ce2c08d8257b10
diff --git a/trunk/drivers/mtd/afs.c b/trunk/drivers/mtd/afs.c
index 801e6c7d0892..7363e101eb0f 100644
--- a/trunk/drivers/mtd/afs.c
+++ b/trunk/drivers/mtd/afs.c
@@ -219,7 +219,7 @@ static int parse_afs_partitions(struct mtd_info *mtd,
 	 */
 	for (idx = off = 0; off < mtd->size; off += mtd->erasesize) {
 		struct image_info_struct iis;
-		u_int iis_ptr, img_ptr, size;
+		u_int iis_ptr, img_ptr;
 
 		/* Read the footer. */
 		ret = afs_read_footer(mtd, &img_ptr, &iis_ptr, off, mask);
@@ -236,21 +236,9 @@ static int parse_afs_partitions(struct mtd_info *mtd,
 			continue;
 
 		strcpy(str, iis.name);
-		size = mtd->erasesize + off - img_ptr;
-
-		/*
-		 * In order to support JFFS2 partitions on this layout,
-		 * we must lie to MTD about the real size of JFFS2
-		 * partitions; this ensures that the AFS flash footer
-		 * won't be erased by JFFS2.  Please ensure that your
-		 * JFFS2 partitions are given image numbers between
-		 * 1000 and 2000 inclusive.
-		 */
-		if (iis.imageNumber >= 1000 && iis.imageNumber < 2000)
-			size -= mtd->erasesize;
 
 		parts[idx].name		= str;
-		parts[idx].size		= size;
+		parts[idx].size		= (iis.length + mtd->erasesize - 1) & ~(mtd->erasesize - 1);
 		parts[idx].offset	= img_ptr;
 		parts[idx].mask_flags	= 0;