qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-16 18:57:31 +02:00
Code

brcm47xx: fix cfe config detection on WGT634U broken in r33920

Browse Source 
Thanks Russell Senior for reporting this.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34175 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2012-11-12 21:32:33 +00:00
parent 5f1dbcc46a
commit d4cf962eb9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target/linux/brcm47xx/patches-3.3/820-wgt634u-nvram-fix.patch
View File

@ -254,10 +254,10 @@ out the configuration than the in kernel cfe config reader.
static u32 find_nvram_size(u32 end) static u32 find_nvram_size(u32 end)
{ {
@@ -59,6 +61,25 @@ static void early_nvram_init_fill(u32 ba @@ -47,6 +49,26 @@ static void early_nvram_init_fill(u32 ba
} u32 *src, *dst;
off <<= 1; u32 size;
}
+ cfe_env = 0; + cfe_env = 0;
+ +
+ /* XXX: hack for supporting the CFE environment stuff on WGT634U */ + /* XXX: hack for supporting the CFE environment stuff on WGT634U */
@ -277,10 +277,11 @@ out the configuration than the in kernel cfe config reader.
+ return; + return;
+ } + }
+ } + }
+
/* Try embedded NVRAM at 4 KB and 1 KB as last resorts */ /* TODO: when nvram is on nand flash check for bad blocks first. */
header = (struct nvram_header *) KSEG1ADDR(base + 4096); off = FLASH_MIN;
@@ -166,6 +187,12 @@ int nvram_getenv(char *name, char *val, while (off <= lim) {
@@ -166,6 +188,12 @@ int nvram_getenv(char *name, char *val,
if (!nvram_buf[0]) if (!nvram_buf[0])
early_nvram_init(); early_nvram_init();
@ -293,7 +294,7 @@ out the configuration than the in kernel cfe config reader.
/* Look for name=value and return value */ /* Look for name=value and return value */
var = &nvram_buf[sizeof(struct nvram_header)]; var = &nvram_buf[sizeof(struct nvram_header)];
end = nvram_buf + sizeof(nvram_buf) - 2; end = nvram_buf + sizeof(nvram_buf) - 2;
@@ -194,6 +221,9 @@ char *nvram_get(const char *name) @@ -194,6 +222,9 @@ char *nvram_get(const char *name)
if (!nvram_buf[0]) if (!nvram_buf[0])
early_nvram_init(); early_nvram_init();