Changeset 30638


Ignore:
Timestamp:
2012-02-19T00:08:26+01:00 (6 years ago)
Author:
hauke
Message:

brcm47xx: sprom for nvram parsing

This adds support for parsing sprom form nvram for sprom version form 1 to 9.
It also adds sprom from nvram support for devices on the bcma bus.

Location:
trunk/target/linux/brcm47xx/patches-3.2
Files:
10 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-3.2/0043-bcma-add-extra-sprom-check.patch

    r29843 r30638  
    1515--- a/drivers/bcma/sprom.c 
    1616+++ b/drivers/bcma/sprom.c 
    17 @@ -210,6 +210,7 @@ int bcma_sprom_get(struct bcma_bus *bus) 
     17@@ -209,6 +209,7 @@ int bcma_sprom_get(struct bcma_bus *bus) 
    1818 { 
    1919        u16 offset; 
     
    2323  
    2424        if (!bus->drv_cc.core) 
    25 @@ -220,6 +221,13 @@ int bcma_sprom_get(struct bcma_bus *bus) 
     25@@ -217,6 +218,12 @@ int bcma_sprom_get(struct bcma_bus *bus) 
     26        if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM)) 
    2627                return -ENOENT; 
    27         } 
    2828  
    2929+       if (bus->drv_cc.core->id.rev >= 32) { 
    3030+               sromctrl = bcma_read32(bus->drv_cc.core, BCMA_CC_SROM_CONTROL); 
    3131+               if (!(sromctrl & BCMA_CC_SROM_CONTROL_PRESENT)) 
    32 +                       random_ether_addr(bus->sprom.il0mac); 
    3332+                       return -ENOENT; 
    3433+       } 
  • trunk/target/linux/brcm47xx/patches-3.2/400-arch-bcm47xx.patch

    r29756 r30638  
    11--- a/arch/mips/bcm47xx/nvram.c 
    22+++ b/arch/mips/bcm47xx/nvram.c 
    3 @@ -199,3 +199,30 @@ int nvram_getenv(char *name, char *val, 
     3@@ -198,3 +198,30 @@ int nvram_getenv(char *name, char *val, 
    44        return NVRAM_ERR_ENVNOTFOUND; 
    55 } 
     
    3434--- a/arch/mips/bcm47xx/setup.c 
    3535+++ b/arch/mips/bcm47xx/setup.c 
    36 @@ -469,3 +469,20 @@ static int __init bcm47xx_register_flash 
     36@@ -351,3 +351,20 @@ static int __init bcm47xx_register_flash 
    3737        return -1; 
    3838 } 
  • trunk/target/linux/brcm47xx/patches-3.2/812-disable_wgt634u_crap.patch

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

    r27902 r30638  
    1010 # 
    1111  
    12 -obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o bus.o 
    13 +obj-y                          += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o bus.o cfe_env.o 
     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 
    1414--- /dev/null 
    1515+++ b/arch/mips/bcm47xx/cfe_env.c 
     
    294294        var = &nvram_buf[sizeof(struct nvram_header)]; 
    295295        end = nvram_buf + sizeof(nvram_buf) - 2; 
    296 @@ -210,6 +237,9 @@ char *nvram_get(const char *name) 
     296@@ -209,6 +236,9 @@ char *nvram_get(const char *name) 
    297297        if (!nvram_buf[0]) 
    298298                early_nvram_init(); 
  • trunk/target/linux/brcm47xx/patches-3.2/980-wnr834b_no_cardbus_invariant.patch

    r29756 r30638  
    11--- a/arch/mips/bcm47xx/setup.c 
    22+++ b/arch/mips/bcm47xx/setup.c 
    3 @@ -278,6 +278,10 @@ static int bcm47xx_get_invariants(struct 
     3@@ -129,6 +129,10 @@ static int bcm47xx_get_invariants(struct 
    44        if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) 
    55                iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10); 
Note: See TracChangeset for help on using the changeset viewer.