aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm-2.4/patches
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-06-23 17:59:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-06-23 17:59:23 +0000
commitad091bcd8ee9c6dcadf224d5d3eb63d0aa18feec (patch)
tree937a4ff86da0c1857a4d451da5f19e339360e72a /target/linux/brcm-2.4/patches
parent4c585f609a4a39fd00a40d80df9b93538ab5a5a6 (diff)
downloadupstream-ad091bcd8ee9c6dcadf224d5d3eb63d0aa18feec.tar.gz
upstream-ad091bcd8ee9c6dcadf224d5d3eb63d0aa18feec.tar.bz2
upstream-ad091bcd8ee9c6dcadf224d5d3eb63d0aa18feec.zip
fix partition align
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4059 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm-2.4/patches')
-rw-r--r--target/linux/brcm-2.4/patches/004-flash.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/brcm-2.4/patches/004-flash.patch b/target/linux/brcm-2.4/patches/004-flash.patch
index 7a070128ed..14ba3b15f4 100644
--- a/target/linux/brcm-2.4/patches/004-flash.patch
+++ b/target/linux/brcm-2.4/patches/004-flash.patch
@@ -334,7 +334,7 @@ diff -urN linux.old/drivers/mtd/devices/sflash.c linux.dev/drivers/mtd/devices/s
diff -urN linux.old/drivers/mtd/maps/bcm947xx-flash.c linux.dev/drivers/mtd/maps/bcm947xx-flash.c
--- linux.old/drivers/mtd/maps/bcm947xx-flash.c 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/drivers/mtd/maps/bcm947xx-flash.c 2006-06-23 18:08:46.000000000 +0200
-@@ -0,0 +1,545 @@
+@@ -0,0 +1,547 @@
+/*
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
@@ -664,8 +664,10 @@ diff -urN linux.old/drivers/mtd/maps/bcm947xx-flash.c linux.dev/drivers/mtd/maps
+
+ /* Update the squashfs partition size based on the superblock info */
+ part->size = sb->bytes_used;
-+ part->size += (mtd->erasesize - 1);
-+ part->size &= ~(mtd->erasesize - 1);
++ len = part->offset + part->size;
++ len += (mtd->erasesize - 1);
++ len &= ~(mtd->erasesize - 1);
++ part->size = len - part->offset;
+ } else if (*((__u16 *) buf) == JFFS2_MAGIC_BITMASK) {
+ printk(KERN_INFO "%s: Filesystem type: jffs2\n", mtd->name);
+