From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 24 Aug 2005 00:18:33 +0000 (+0000)
Subject: fix ar7 flash map driver handling of jffs2 images
X-Git-Tag: reboot~32160
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d3f34f32e25426438b4e519a5aad6f69b8037cb3;p=openwrt%2Fstaging%2Fnoltari.git

fix ar7 flash map driver handling of jffs2 images

SVN-Revision: 1743
---

diff --git a/openwrt/target/linux/linux-2.4/patches/ar7/001-flash_map.patch b/openwrt/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
index df73515809..83bc103bef 100644
--- a/openwrt/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
+++ b/openwrt/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
@@ -1,7 +1,7 @@
 diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-flash.c
 --- linux.old/drivers/mtd/maps/ar7-flash.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux.dev/drivers/mtd/maps/ar7-flash.c	2005-07-22 04:35:26.624453992 +0200
-@@ -0,0 +1,265 @@
+@@ -0,0 +1,267 @@
 +/*
 + * $Id$
 + *
@@ -240,8 +240,10 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
 +		ar7_partinfo[p++].mask_flags = 0;
 +	} else {
 +		printk("Unknown filesystem. Moving rootfs partition to next erase block");
-+		if ((rootfs_start % ar7_mtd_info->erasesize) > 0)
-+			rootfs_start += ar7_mtd_info->erasesize - (rootfs_start % ar7_mtd_info->erasesize);
++		if ((rootfs_start % ar7_mtd_info->erasesize) > 0) {
++			ar7_partinfo[p - 2].offset += ar7_mtd_info->erasesize - (rootfs_start % ar7_mtd_info->erasesize);
++			ar7_partinfo[p - 2].size -= ar7_mtd_info->erasesize - (rootfs_start % ar7_mtd_info->erasesize);
++		}
 +	}
 +
 +	return p;