summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/patches-3.7/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-02-04 10:19:50 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-02-04 10:19:50 +0000
commit404cd71e7c4cb3b69a53db4876c0b2cbf27c3036 (patch)
tree2a0a6f9f6e49e2f6fc676b151fff168991ff6ffe /target/linux/brcm63xx/patches-3.7/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch
parenta8fbf328d42ff0348a4741697ce20bacc50b1116 (diff)
bcm63xx: add support for linux 3.7
Based on 3.7.6. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35481 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.7/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.7/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.7/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch b/target/linux/brcm63xx/patches-3.7/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch
new file mode 100644
index 0000000000..da24b1b858
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.7/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)