From: Daniel Dickinson Date: Tue, 28 Dec 2010 04:05:04 +0000 (+0000) Subject: patches-2.6.36: Fix flashmap spare length calculation from previous commit (for rootf... X-Git-Tag: reboot~17956 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5ee2a6c696da3b4f351b25acfeb4e00e9fb00e13;p=openwrt%2Fstaging%2Fxback.git 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. SVN-Revision: 24842 --- 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 + 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;