Changeset 34175


Ignore:
Timestamp:
2012-11-12T22:32:33+01:00 (5 years ago)
Author:
hauke
Message:

brcm47xx: fix cfe config detection on WGT634U broken in r33920

Thanks Russell Senior for reporting this.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-3.3/820-wgt634u-nvram-fix.patch

    r33920 r34175  
    255255 static u32 find_nvram_size(u32 end) 
    256256 { 
    257 @@ -59,6 +61,25 @@ static void early_nvram_init_fill(u32 ba 
    258                 } 
    259                 off <<= 1; 
    260         } 
     257@@ -47,6 +49,26 @@ static void early_nvram_init_fill(u32 ba 
     258        u32 *src, *dst; 
     259        u32 size; 
     260  
    261261+       cfe_env = 0; 
    262262+ 
     
    278278+               } 
    279279+       } 
    280   
    281         /* Try embedded NVRAM at 4 KB and 1 KB as last resorts */ 
    282         header = (struct nvram_header *) KSEG1ADDR(base + 4096); 
    283 @@ -166,6 +187,12 @@ int nvram_getenv(char *name, char *val, 
     280+ 
     281        /* TODO: when nvram is on nand flash check for bad blocks first. */ 
     282        off = FLASH_MIN; 
     283        while (off <= lim) { 
     284@@ -166,6 +188,12 @@ int nvram_getenv(char *name, char *val, 
    284285        if (!nvram_buf[0]) 
    285286                early_nvram_init(); 
     
    294295        var = &nvram_buf[sizeof(struct nvram_header)]; 
    295296        end = nvram_buf + sizeof(nvram_buf) - 2; 
    296 @@ -194,6 +221,9 @@ char *nvram_get(const char *name) 
     297@@ -194,6 +222,9 @@ char *nvram_get(const char *name) 
    297298        if (!nvram_buf[0]) 
    298299                early_nvram_init(); 
Note: See TracChangeset for help on using the changeset viewer.