diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-10 14:05:18 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-10 14:05:18 +0000 |
| commit | e676003d8704a75d5ee3b58ccf820e827f836de9 (patch) | |
| tree | f3d6e1fbe661581152ae5ee189db20ea7f00ac5d /target/linux/brcm47xx/patches-3.6/080-MIPS-BCM47XX-rewrite-nvram-probing.patch | |
| parent | 75662734f2aa2805f480b25bdf8c601e444d7633 (diff) | |
kernel: update bcma and ssb to master-2013-01-09 from wireless-testing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35080 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/080-MIPS-BCM47XX-rewrite-nvram-probing.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/080-MIPS-BCM47XX-rewrite-nvram-probing.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/080-MIPS-BCM47XX-rewrite-nvram-probing.patch b/target/linux/brcm47xx/patches-3.6/080-MIPS-BCM47XX-rewrite-nvram-probing.patch index ecc9e04134..1e75b10fbb 100644 --- a/target/linux/brcm47xx/patches-3.6/080-MIPS-BCM47XX-rewrite-nvram-probing.patch +++ b/target/linux/brcm47xx/patches-3.6/080-MIPS-BCM47XX-rewrite-nvram-probing.patch @@ -9,7 +9,7 @@ * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the -@@ -18,83 +18,166 @@ +@@ -18,83 +18,168 @@ #include <linux/kernel.h> #include <linux/string.h> #include <asm/addrspace.h> @@ -122,14 +122,15 @@ + memset(dst, 0x0, NVRAM_SPACE - i); + + return 0; - } - --int nvram_getenv(char *name, char *val, size_t val_len) ++} ++ +#ifdef CONFIG_BCM47XX_SSB +static int nvram_init_ssb(void) +{ + struct ssb_mipscore *mcore = &bcm47xx_bus.ssb.mipscore; ++#ifdef CONFIG_SSB_SFLASH + struct ssb_chipcommon *chipco = &bcm47xx_bus.ssb.chipco; ++#endif + u32 base; + u32 lim; + @@ -177,9 +178,10 @@ + } + + return nvram_find_and_copy(base, lim); -+} + } +#endif -+ + +-int nvram_getenv(char *name, char *val, size_t val_len) +static int nvram_init(void) +{ + switch (bcm47xx_bus_type) { @@ -214,7 +216,7 @@ /* Look for name=value and return value */ var = &nvram_buf[sizeof(struct nvram_header)]; -@@ -110,6 +193,6 @@ int nvram_getenv(char *name, char *val, +@@ -110,6 +195,6 @@ int nvram_getenv(char *name, char *val, return snprintf(val, val_len, "%s", value); } } |