summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-22 15:27:42 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-22 15:27:42 +0000
commit636b91e85b14a71a25353d3e35e7a5349431fc96 (patch)
treea879777b57f4f24886aae8ba3300dcf22d190a0f
parente2acb9f8d89577658595fb8da97b38b7c0c75eca (diff)
[brcm63xx] alwasy read imagetag with 64K erase block size
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21085 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch2
2 files changed, 2 insertions, 2 deletions
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;