From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 22 Apr 2010 15:27:42 +0000 (+0000)
Subject: alwasy read imagetag with 64K erase block size
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=be2a5389e68d75b839bde6fe4bd3a8c18ef28512;p=openwrt%2Fstaging%2F981213.git

alwasy read imagetag with 64K erase block size

SVN-Revision: 21085
---

diff --git a/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch
index 117074b994..137b08f159 100644
--- a/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch
@@ -148,7 +148,7 @@ Index: linux-2.6.32.10/drivers/mtd/maps/bcm963xx-flash.c
 +		return -ENOMEM;
 +
 +	/* Get the tag */
-+	ret = master->read(master,master->erasesize,sizeof(struct bcm_tag), &retlen, (void *)buf);
++	ret = master->read(master,0x10000,sizeof(struct bcm_tag), &retlen, (void *)buf);
 +	if (retlen != sizeof(struct bcm_tag)){
 +		vfree(buf);
 +		return -EIO;
diff --git a/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
index cd0ec549d2..b6132eb078 100644
--- a/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
@@ -189,7 +189,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
 +		return -ENOMEM;
 +
 +	/* Get the tag */
-+	ret = master->read(master,master->erasesize,sizeof(union bcm_tag), &retlen, (void *)buf);
++	ret = master->read(master,0x10000,sizeof(union bcm_tag), &retlen, (void *)buf);
 +	if (retlen != sizeof(union bcm_tag)){
 +		vfree(buf);
 +		return -EIO;