Changeset 32845


Ignore:
Timestamp:
2012-07-25T16:52:00+02:00 (6 years ago)
Author:
hauke
Message:

brcm47xx: reorder patches so that the patches already in mainline linux will be applied at first.

Location:
trunk/target/linux/brcm47xx/patches-3.3
Files:
1 added
6 edited
9 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-3.3/001-MIPS-BCM47XX-return-number-of-written-bytes-in-nvram.patch

    r32844 r32845  
    1  
    21--- a/arch/mips/bcm47xx/nvram.c 
    32+++ b/arch/mips/bcm47xx/nvram.c 
    4 @@ -268,8 +268,7 @@ int nvram_getenv(char *name, char *val, 
     3@@ -107,8 +107,7 @@ int nvram_getenv(char *name, char *val, 
    54                value = eq + 1; 
    65                if ((eq - var) == strlen(name) && 
  • trunk/target/linux/brcm47xx/patches-3.3/002-MIPS-BCM47XX-fix-signature-of-nvram_parse_macaddr.patch

    r32844 r32845  
    1  
    21--- a/arch/mips/include/asm/mach-bcm47xx/nvram.h 
    32+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h 
  • trunk/target/linux/brcm47xx/patches-3.3/003-MIPS-BCM47XX-move-and-extend-sprom-parsing.patch

    r32844 r32845  
    55 # 
    66  
    7 -obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o bus.o 
    8 +obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o bus.o sprom.o 
     7-obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o 
     8+obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o 
    99 obj-$(CONFIG_BCM47XX_SSB)      += wgt634u.o 
    1010--- a/arch/mips/bcm47xx/setup.c 
    1111+++ b/arch/mips/bcm47xx/setup.c 
    12 @@ -132,156 +132,7 @@ static void bcm47xx_machine_halt(void) 
     12@@ -85,156 +85,7 @@ static void bcm47xx_machine_halt(void) 
    1313 } 
    1414  
  • trunk/target/linux/brcm47xx/patches-3.3/004-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch

    r32844 r32845  
    77- *  Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.de> 
    88+ *  Copyright (C) 2010-2012 Hauke Mehrtens <hauke@hauke-m.de> 
    9   *  Copyright (C) 2011-2012 Tathagata Das <tathagata@alumnux.com> 
    109  * 
    1110  *  This program is free software; you can redistribute  it and/or modify it 
    12 @@ -132,7 +132,7 @@ static void bcm47xx_machine_halt(void) 
     11  *  under  the terms of  the GNU General  Public License as published by the 
     12@@ -85,7 +85,7 @@ static void bcm47xx_machine_halt(void) 
    1313 } 
    1414  
     
    1919        char prefix[10]; 
    2020  
    21 @@ -149,7 +149,7 @@ static int bcm47xx_get_sprom(struct ssb_ 
     21@@ -102,7 +102,7 @@ static int bcm47xx_get_sprom(struct ssb_ 
    2222 } 
    2323  
     
    2828        char buf[20]; 
    2929  
    30 @@ -204,7 +204,7 @@ static void __init bcm47xx_register_ssb( 
     30@@ -132,7 +132,7 @@ static void __init bcm47xx_register_ssb( 
    3131        char buf[100]; 
    3232        struct ssb_mipscore *mcore; 
     
    3737                printk(KERN_WARNING "bcm47xx: someone else already registered" 
    3838                        " a ssb SPROM callback handler (err %d)\n", err); 
    39 @@ -256,10 +256,41 @@ static int __init bcm47xx_register_flash 
     39@@ -159,10 +159,41 @@ static void __init bcm47xx_register_ssb( 
    4040 #endif 
    4141  
  • trunk/target/linux/brcm47xx/patches-3.3/005-ssb-remove-rev-from-boardinfo.patch

    r32844 r32845  
    11--- a/arch/mips/bcm47xx/setup.c 
    22+++ b/arch/mips/bcm47xx/setup.c 
    3 @@ -163,8 +163,6 @@ static int bcm47xx_get_invariants(struct 
     3@@ -115,8 +115,6 @@ static int bcm47xx_get_invariants(struct 
    44                iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM; 
    55        if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0) 
     
    88-               iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0); 
    99  
    10         memset(&iv->sprom, 0, sizeof(struct ssb_sprom)); 
    1110        bcm47xx_fill_sprom(&iv->sprom, NULL); 
     11  
  • trunk/target/linux/brcm47xx/patches-3.3/006-MIPS-bcm47xx-refactor-fetching-board-data.patch

    r32844 r32845  
    11--- a/arch/mips/bcm47xx/setup.c 
    22+++ b/arch/mips/bcm47xx/setup.c 
    3 @@ -157,12 +157,7 @@ static int bcm47xx_get_invariants(struct 
     3@@ -109,12 +109,7 @@ static int bcm47xx_get_invariants(struct 
    44        /* Fill boardinfo structure */ 
    55        memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo)); 
     
    1313+       bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL); 
    1414  
    15         memset(&iv->sprom, 0, sizeof(struct ssb_sprom)); 
    1615        bcm47xx_fill_sprom(&iv->sprom, NULL); 
     16  
    1717--- a/arch/mips/bcm47xx/sprom.c 
    1818+++ b/arch/mips/bcm47xx/sprom.c 
    19 @@ -616,3 +616,15 @@ void bcm47xx_fill_sprom(struct ssb_sprom 
     19@@ -618,3 +618,15 @@ void bcm47xx_fill_sprom(struct ssb_sprom 
    2020                bcm47xx_fill_sprom_r1(sprom, prefix); 
    2121        } 
  • trunk/target/linux/brcm47xx/patches-3.3/007-bcma-add-boardinfo-struct.patch

    r32844 r32845  
    11--- a/arch/mips/bcm47xx/setup.c 
    22+++ b/arch/mips/bcm47xx/setup.c 
    3 @@ -297,6 +297,8 @@ static void __init bcm47xx_register_bcma 
    4          
    5         if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_NFLASH) 
    6                 bcm47xx_nflash_struct_bcma_init(&bcm47xx_nflash, &bcm47xx_bus.bcma.bus.drv_cc); 
     3@@ -190,6 +190,8 @@ static void __init bcm47xx_register_bcma 
     4        err = bcma_host_soc_register(&bcm47xx_bus.bcma); 
     5        if (err) 
     6                panic("Failed to initialize BCMA bus (err %d)", err); 
    77+ 
    88+       bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); 
    99 } 
     10 #endif 
    1011  
    11  static int __init bcm47xx_register_flash_bcma(void) 
    1212--- a/arch/mips/bcm47xx/sprom.c 
    1313+++ b/arch/mips/bcm47xx/sprom.c 
    14 @@ -628,3 +628,15 @@ void bcm47xx_fill_ssb_boardinfo(struct s 
     14@@ -630,3 +630,15 @@ void bcm47xx_fill_ssb_boardinfo(struct s 
    1515        nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0); 
    1616 } 
  • trunk/target/linux/brcm47xx/patches-3.3/009-bcma_reorder_sprom_fill.patch

    r32844 r32845  
    11--- a/arch/mips/bcm47xx/setup.c 
    22+++ b/arch/mips/bcm47xx/setup.c 
    3 @@ -137,6 +137,7 @@ static int bcm47xx_get_sprom_ssb(struct 
     3@@ -90,6 +90,7 @@ static int bcm47xx_get_sprom_ssb(struct 
    44        char prefix[10]; 
    55  
     
    99                         bus->host_pci->bus->number + 1, 
    1010                         PCI_SLOT(bus->host_pci->devfn)); 
    11 @@ -165,6 +166,7 @@ static int bcm47xx_get_invariants(struct 
    12         if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0) 
    13                 iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0); 
     11@@ -111,6 +112,7 @@ static int bcm47xx_get_invariants(struct 
     12  
     13        bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL); 
    1414  
    1515+       memset(&iv->sprom, 0, sizeof(struct ssb_sprom)); 
     
    1717  
    1818        if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) 
    19 @@ -263,12 +265,14 @@ static int bcm47xx_get_sprom_bcma(struct 
     19@@ -159,12 +161,14 @@ static int bcm47xx_get_sprom_bcma(struct 
    2020  
    2121        switch (bus->hosttype) { 
     
    3434--- a/arch/mips/bcm47xx/sprom.c 
    3535+++ b/arch/mips/bcm47xx/sprom.c 
    36 @@ -555,8 +555,6 @@ void bcm47xx_fill_sprom_ethernet(struct 
     36@@ -557,8 +557,6 @@ void bcm47xx_fill_sprom_ethernet(struct 
    3737  
    3838 void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix) 
  • trunk/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch

    r31573 r32845  
    55 # 
    66  
    7 -obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o 
    8 +obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o bus.o 
     7-obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o 
     8+obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o bus.o 
    99 obj-$(CONFIG_BCM47XX_SSB)      += wgt634u.o 
    1010--- /dev/null 
     
    104104 { 
    105105        printk(KERN_ALERT "Please stand by while rebooting the system...\n"); 
    106 @@ -291,6 +293,9 @@ static void __init bcm47xx_register_ssb( 
     106@@ -137,6 +139,9 @@ static void __init bcm47xx_register_ssb( 
    107107        if (err) 
    108108                panic("Failed to initialize SSB bus (err %d)", err); 
     
    114114        if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) { 
    115115                if (strstr(buf, "console=ttyS1")) { 
    116 @@ -315,6 +320,9 @@ static void __init bcm47xx_register_bcma 
    117         err = bcma_host_soc_register(&bcm47xx_bus.bcma); 
     116@@ -195,6 +200,9 @@ static void __init bcm47xx_register_bcma 
    118117        if (err) 
    119118                panic("Failed to initialize BCMA bus (err %d)", err); 
    120 + 
     119  
    121120+       if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_SFLASH) 
    122121+               bcm47xx_sflash_struct_bcma_init(&bcm47xx_sflash, &bcm47xx_bus.bcma.bus.drv_cc); 
     122+ 
     123        bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); 
    123124 } 
    124125 #endif 
    125   
    126126--- /dev/null 
    127127+++ b/arch/mips/include/asm/mach-bcm47xx/bus.h 
  • trunk/target/linux/brcm47xx/patches-3.3/028-bcm47xx-register-flash-drivers.patch

    r31126 r32845  
    99        help 
    1010         Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support. 
    11 @@ -22,6 +23,7 @@ config BCM47XX_BCMA 
    12         select BCMA_HOST_SOC 
     11@@ -23,6 +24,7 @@ config BCM47XX_BCMA 
    1312        select BCMA_DRIVER_MIPS 
     13        select BCMA_HOST_PCI if PCI 
    1414        select BCMA_DRIVER_PCI_HOSTMODE if PCI 
    1515+       select BCMA_SFLASH 
     
    6565 { 
    6666        printk(KERN_ALERT "Please stand by while rebooting the system...\n"); 
    67 @@ -310,6 +338,24 @@ static void __init bcm47xx_register_ssb( 
     67@@ -156,6 +184,24 @@ static void __init bcm47xx_register_ssb( 
    6868                } 
    6969        } 
     
    9090  
    9191 #ifdef CONFIG_BCM47XX_BCMA 
    92 @@ -324,6 +370,24 @@ static void __init bcm47xx_register_bcma 
    93         if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_SFLASH) 
    94                 bcm47xx_sflash_struct_bcma_init(&bcm47xx_sflash, &bcm47xx_bus.bcma.bus.drv_cc); 
     92@@ -205,6 +251,24 @@ static void __init bcm47xx_register_bcma 
     93  
     94        bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); 
    9595 } 
    9696+ 
     
    115115  
    116116 void __init plat_mem_setup(void) 
    117 @@ -366,3 +430,19 @@ static int __init bcm47xx_register_bus_c 
     117@@ -247,3 +311,19 @@ static int __init bcm47xx_register_bus_c 
    118118        return 0; 
    119119 } 
  • trunk/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch

    r32670 r32845  
    11--- a/arch/mips/bcm47xx/Kconfig 
    22+++ b/arch/mips/bcm47xx/Kconfig 
    3 @@ -24,6 +24,7 @@ config BCM47XX_BCMA 
    4         select BCMA_DRIVER_MIPS 
     3@@ -25,6 +25,7 @@ config BCM47XX_BCMA 
     4        select BCMA_HOST_PCI if PCI 
    55        select BCMA_DRIVER_PCI_HOSTMODE if PCI 
    66        select BCMA_SFLASH 
     
    116116  *  Copyright (C) 2006 Michael Buesch <m@bues.ch> 
    117117  *  Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org> 
    118   *  Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.de> 
     118  *  Copyright (C) 2010-2012 Hauke Mehrtens <hauke@hauke-m.de> 
    119119+ *  Copyright (C) 2011-2012 Tathagata Das <tathagata@alumnux.com> 
    120120  * 
     
    149149 { 
    150150        printk(KERN_ALERT "Please stand by while rebooting the system...\n"); 
    151 @@ -369,6 +384,9 @@ static void __init bcm47xx_register_bcma 
     151@@ -248,6 +263,9 @@ static void __init bcm47xx_register_bcma 
    152152  
    153153        if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_SFLASH) 
     
    156156+       if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_NFLASH) 
    157157+               bcm47xx_nflash_struct_bcma_init(&bcm47xx_nflash, &bcm47xx_bus.bcma.bus.drv_cc); 
     158  
     159        bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); 
    158160 } 
    159   
    160  static int __init bcm47xx_register_flash_bcma(void) 
    161 @@ -383,6 +401,9 @@ static int __init bcm47xx_register_flash 
     161@@ -264,6 +282,9 @@ static int __init bcm47xx_register_flash 
    162162        case BCMA_SFLASH: 
    163163                bcm47xx_sflash_dev.dev.platform_data = &bcm47xx_sflash; 
  • trunk/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch

    r31126 r32845  
    2525 #include <asm/reboot.h> 
    2626 #include <asm/time.h> 
    27 @@ -320,6 +322,31 @@ static int bcm47xx_get_invariants(struct 
     27@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct 
    2828        return 0; 
    2929 } 
     
    5757 { 
    5858        int err; 
    59 @@ -352,6 +379,10 @@ static void __init bcm47xx_register_ssb( 
     59@@ -198,6 +225,10 @@ static void __init bcm47xx_register_ssb( 
    6060                        memcpy(&mcore->serial_ports[1], &port, sizeof(port)); 
    6161                } 
  • trunk/target/linux/brcm47xx/patches-3.3/812-disable_wgt634u_crap.patch

    r30638 r32845  
    44 # 
    55  
    6  obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o bus.o sprom.o 
     6 obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o bus.o 
    77-obj-$(CONFIG_BCM47XX_SSB)      += wgt634u.o 
    88--- a/arch/mips/bcm47xx/wgt634u.c 
  • trunk/target/linux/brcm47xx/patches-3.3/820-wgt634u-nvram-fix.patch

    r31790 r32845  
    1010 # 
    1111  
    12 -obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o bus.o sprom.o 
    13 +obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o bus.o sprom.o cfe_env.o 
     12-obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o bus.o 
     13+obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o bus.o cfe_env.o 
    1414--- /dev/null 
    1515+++ b/arch/mips/bcm47xx/cfe_env.c 
Note: See TracChangeset for help on using the changeset viewer.