Changeset 25810


Ignore:
Timestamp:
2011-03-01T17:02:38+01:00 (7 years ago)
Author:
florian
Message:

[brcm63xx] fix patches after 2.6.37 update, patch from KanjiMonster

Location:
trunk/target/linux/brcm63xx/patches-2.6.37
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/patches-2.6.37/040-bcm963xx_flashmap.patch

    r25629 r25810  
    1 From b1096781081b328fdac0e14a726ea04c2e9545c7 Mon Sep 17 00:00:00 2001 
     1From a4d005c91d403d9f3d0272db6cc46202c06ec774 Mon Sep 17 00:00:00 2001 
    22From: Axel Gembe <ago@bastart.eu.org> 
    33Date: Mon, 12 May 2008 18:54:09 +0200 
     
    66Signed-off-by: Axel Gembe <ago@bastart.eu.org> 
    77--- 
    8  arch/mips/bcm63xx/boards/board_bcm963xx.c |   19 +--------------- 
    9  drivers/mtd/maps/bcm963xx-flash.c         |   34 ++++++++++++++++++++++++---- 
    10  drivers/mtd/redboot.c                     |   13 ++++++++-- 
    11  3 files changed, 40 insertions(+), 26 deletions(-) 
     8 arch/mips/bcm63xx/boards/board_bcm963xx.c |   19 +---------------- 
     9 drivers/mtd/maps/bcm963xx-flash.c         |   32 ++++++++++++++++++++++++---- 
     10 drivers/mtd/redboot.c                     |   13 +++++++++-- 
     11 3 files changed, 38 insertions(+), 26 deletions(-) 
    1212 
    1313--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     
    7474  
    7575 static struct mtd_info *bcm963xx_mtd_info; 
    76 @@ -56,7 +66,7 @@ static int parse_cfe_partitions(struct m 
    77         unsigned int rootfsaddr, kerneladdr, spareaddr; 
    78         unsigned int rootfslen, kernellen, sparelen, totallen; 
    79         int namelen = 0; 
    80 -       int i; 
    81 +       int i, offset; 
    82         char *boardid; 
    83         char *tagversion; 
    84   
    85 @@ -84,9 +94,11 @@ static int parse_cfe_partitions(struct m 
    86   
    87         kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE; 
    88         rootfsaddr = kerneladdr + kernellen; 
    89 + 
    90 +       rootfslen = ( ( rootfslen % master->erasesize ) > 0 ? (((rootfslen / master->erasesize) + 1 ) * master->erasesize) : rootfslen); 
    91 + 
    92         spareaddr = roundup(totallen, master->erasesize) + master->erasesize; 
    93         sparelen = master->size - spareaddr - master->erasesize; 
    94 -       rootfslen = spareaddr - rootfsaddr; 
    95   
    96         /* Determine number of partitions */ 
    97         namelen = 8; 
    98 @@ -214,9 +226,21 @@ static int bcm963xx_probe(struct platfor 
     76@@ -214,9 +224,21 @@ static int bcm963xx_probe(struct platfor 
    9977                        } 
    10078                } 
Note: See TracChangeset for help on using the changeset viewer.