aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorDaniel Dickinson <daniel@cshore.neomailbox.net>2010-12-28 04:05:04 +0000
committerDaniel Dickinson <daniel@cshore.neomailbox.net>2010-12-28 04:05:04 +0000
commitcec38029645787bd43c09421a0dad8537d2814d0 (patch)
tree6a3ffde2cc28ef712e021306a7d826a578be4278 /target
parent62f90595e10e4b7490ec51c5bec0b55d6312af4b (diff)
downloadupstream-cec38029645787bd43c09421a0dad8537d2814d0.tar.gz
upstream-cec38029645787bd43c09421a0dad8537d2814d0.tar.bz2
upstream-cec38029645787bd43c09421a0dad8537d2814d0.zip
[brcm63xx] patches-2.6.36: Fix flashmap spare length calculation from previous commit (for rootfs and rootfs_data mtd partitions). Apparently the interruption in working on it resulted in an incorrect memory of getting it working.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24842 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm63xx/patches-2.6.35/040-bcm963xx_flashmap.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.35/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-2.6.35/040-bcm963xx_flashmap.patch
index 4835a159ae..5a5ba12834 100644
--- a/target/linux/brcm63xx/patches-2.6.35/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/040-bcm963xx_flashmap.patch
@@ -179,8 +179,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
+ rootfslen = ( ( rootfslen % master->erasesize ) > 0 ? (((rootfslen / master->erasesize) + 1 ) * master->erasesize) : rootfslen);
+ totallen = rootfslen + kernellen + sizeof(struct bcm_tag);
+
-+ spareaddr = roundup(totallen, master->erasesize) + master->erasesize;
-+ sparelen = master->size - spareaddr - master->erasesize;
++ spareaddr = rootfsaddr + rootfslen;
++ sparelen = master->size - totallen - master->erasesize;
+
+ /* Determine number of partitions */
+ namelen = 8;