Changeset 21086


Ignore:
Timestamp:
2010-04-22T17:27:46+02:00 (6 years ago)
Author:
florian
Message:

[brcm63xx] refresh 2.6.32 patches

Location:
trunk/target/linux/brcm63xx/patches-2.6.32
Files:
2 edited

Legend:

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

    r21085 r21086  
    1212 3 files changed, 18 insertions(+), 3 deletions(-) 
    1313 
    14 Index: linux-2.6.32.10/drivers/mtd/maps/Kconfig 
    15 =================================================================== 
    16 --- linux-2.6.32.10.orig/drivers/mtd/maps/Kconfig       2010-03-29 06:35:59.987293878 -0400 
    17 +++ linux-2.6.32.10/drivers/mtd/maps/Kconfig    2010-03-29 06:37:14.968545954 -0400 
    18 @@ -259,6 +259,13 @@ 
     14--- a/drivers/mtd/maps/Kconfig 
     15+++ b/drivers/mtd/maps/Kconfig 
     16@@ -259,6 +259,13 @@ config MTD_ALCHEMY 
    1917        help 
    2018          Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards 
     
    3028        tristate "CFI Flash device mapped on DIL/Net PC" 
    3129        depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN 
    32 Index: linux-2.6.32.10/drivers/mtd/redboot.c 
    33 =================================================================== 
    34 --- linux-2.6.32.10.orig/drivers/mtd/redboot.c  2010-03-29 06:36:00.017292877 -0400 
    35 +++ linux-2.6.32.10/drivers/mtd/redboot.c       2010-03-29 06:37:14.968545954 -0400 
    36 @@ -39,7 +39,7 @@ 
     30--- a/drivers/mtd/redboot.c 
     31+++ b/drivers/mtd/redboot.c 
     32@@ -39,7 +39,7 @@ static inline int redboot_checksum(struc 
    3733        return 1; 
    3834 } 
     
    4339                              unsigned long fis_origin) 
    4440 { 
    45 @@ -162,6 +162,14 @@ 
     41@@ -162,6 +162,14 @@ static int parse_redboot_partitions(stru 
    4642                goto out; 
    4743        } 
     
    5854                struct fis_list *new_fl, **prev; 
    5955  
    60 @@ -184,9 +192,8 @@ 
     56@@ -184,9 +192,8 @@ static int parse_redboot_partitions(stru 
    6157                new_fl->img = &buf[i]; 
    6258                 if (fis_origin) { 
     
    6965                /* I'm sure the JFFS2 code has done me permanent damage. 
    7066                 * I now think the following is _normal_ 
    71 Index: linux-2.6.32.10/drivers/mtd/maps/Makefile 
    72 =================================================================== 
    73 --- linux-2.6.32.10.orig/drivers/mtd/maps/Makefile      2010-03-29 06:35:59.947294290 -0400 
    74 +++ linux-2.6.32.10/drivers/mtd/maps/Makefile   2010-03-29 06:37:14.968545954 -0400 
    75 @@ -61,3 +61,4 @@ 
     67--- a/drivers/mtd/maps/Makefile 
     68+++ b/drivers/mtd/maps/Makefile 
     69@@ -61,3 +61,4 @@ obj-$(CONFIG_MTD_BFIN_ASYNC)  += bfin-asy 
    7670 obj-$(CONFIG_MTD_RBTX4939)     += rbtx4939-flash.o 
    7771 obj-$(CONFIG_MTD_VMU)          += vmu-flash.o 
    7872 obj-$(CONFIG_MTD_GPIO_ADDR)    += gpio-addr-flash.o 
    7973+obj-$(CONFIG_MTD_BCM963XX)     += bcm963xx-flash.o 
    80 Index: linux-2.6.32.10/drivers/mtd/maps/bcm963xx-flash.c 
    81 =================================================================== 
    82 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    83 +++ linux-2.6.32.10/drivers/mtd/maps/bcm963xx-flash.c   2010-03-29 13:33:58.797288897 -0400 
     74--- /dev/null 
     75+++ b/drivers/mtd/maps/bcm963xx-flash.c 
    8476@@ -0,0 +1,266 @@ 
    8577+/* 
     
    149141+ 
    150142+       /* Get the tag */ 
    151 +       ret = master->read(master,0x10000,sizeof(struct bcm_tag), &retlen, (void *)buf); 
     143+       ret = master->read(master,master->erasesize,sizeof(struct bcm_tag), &retlen, (void *)buf); 
    152144+       if (retlen != sizeof(struct bcm_tag)){ 
    153145+               vfree(buf); 
     
    349341+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); 
    350342+MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>"); 
    351 Index: linux-2.6.32.10/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    352 =================================================================== 
    353 --- linux-2.6.32.10.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c      2010-03-29 06:35:59.927292275 -0400 
    354 +++ linux-2.6.32.10/arch/mips/bcm63xx/boards/board_bcm963xx.c   2010-03-29 06:37:35.178541753 -0400 
    355 @@ -722,20 +722,6 @@ 
     343--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     344+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     345@@ -722,20 +722,6 @@ static int board_get_mac_address(u8 *mac 
    356346        return 0; 
    357347 } 
     
    374364        { 
    375365                .start          = 0,    /* filled at runtime */ 
    376 @@ -745,12 +731,9 @@ 
     366@@ -745,12 +731,9 @@ static struct resource mtd_resources[] = 
    377367 }; 
    378368  
  • trunk/target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch

    r20765 r21086  
    1 --- linux-2.6.32.10.orig/drivers/net/bcm63xx_enet.c     2010-04-06 19:25:52.612158288 +0100 
    2 +++ linux-2.6.32.10/drivers/net/bcm63xx_enet.c  2010-04-07 21:40:26.991801424 +0100 
    3 @@ -965,7 +965,9 @@ 
     1--- a/drivers/net/bcm63xx_enet.c 
     2+++ b/drivers/net/bcm63xx_enet.c 
     3@@ -965,7 +965,9 @@ static int bcm_enet_open(struct net_devi 
    44        /* all set, enable mac and interrupts, start dma engine and 
    55         * kick rx dma channel */ 
Note: See TracChangeset for help on using the changeset viewer.