[brcm63xx] revert r21085, fixes #7282

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21352 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 4784de7..812e008 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch
@@ -140,7 +140,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
 +              return -ENOMEM;
 +
 +      /* Get the tag */
-+      ret = master->read(master,0x10000,sizeof(struct bcm_tag), &retlen, (void *)buf);
++      ret = master->read(master,master->erasesize,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 6edb8c7..5f3e0a2 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
@@ -140,7 +140,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
 +              return -ENOMEM;
 +
 +      /* Get the tag */
-+      ret = master->read(master,0x10000,sizeof(struct bcm_tag), &retlen, (void *)buf);
++      ret = master->read(master,mater->erasesize,sizeof(struct bcm_tag), &retlen, (void *)buf);
 +      if (retlen != sizeof(struct bcm_tag)){
 +              vfree(buf);
 +              return -EIO;