diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
| commit | 8d69af7c9fff947e2e53ba955cf6c84df3f1391e (patch) | |
| tree | 192a79439e8d6b82dd39af6ac6f019c472cdc1c3 /target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch | |
| parent | 6a699a8ae80b5b6ff6559bad1297242c8daf8934 (diff) | |
| download | upstream-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.tar.gz upstream-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.tar.bz2 upstream-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.zip | |
add preliminary support for 3.6 kernel
SVN-Revision: 33936
Diffstat (limited to 'target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch b/target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch new file mode 100644 index 0000000000..da24b1b858 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch @@ -0,0 +1,33 @@ +From fd2ab39f22af4176eb3d23acbc4d1218cf835065 Mon Sep 17 00:00:00 2001 +From: Jonas Gorski <jonas.gorski@gmail.com> +Date: Tue, 8 May 2012 09:47:32 +0200 +Subject: [PATCH 21/79] MTD: bcm63xxpart: merge sparelen calculation + +The length of the spare part is calculated the same way in both branches +so move to a common place. + +Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> +--- + drivers/mtd/bcm63xxpart.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/mtd/bcm63xxpart.c ++++ b/drivers/mtd/bcm63xxpart.c +@@ -120,7 +120,6 @@ static int bcm63xx_parse_cfe_partitions( + kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE; + rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE; + spareaddr = roundup(totallen, master->erasesize) + cfelen; +- sparelen = master->size - spareaddr - nvramlen; + + if (rootfsaddr < kerneladdr) { + /* default Broadcom layout */ +@@ -138,8 +137,8 @@ static int bcm63xx_parse_cfe_partitions( + rootfslen = 0; + rootfsaddr = 0; + spareaddr = cfelen; +- sparelen = master->size - cfelen - nvramlen; + } ++ sparelen = master->size - spareaddr - nvramlen; + + /* Determine number of partitions */ + if (rootfslen > 0) |