diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2013-01-10 14:05:18 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-01-10 14:05:18 +0000 |
commit | 8ffb10c8b8225651ce4c6170226235b896a62cac (patch) | |
tree | f3d6e1fbe661581152ae5ee189db20ea7f00ac5d /target/linux/brcm47xx/patches-3.6/820-wgt634u-nvram-fix.patch | |
parent | 804ae4312508ccd4f1e6ef3f70d535c0db4eadf0 (diff) | |
download | upstream-8ffb10c8b8225651ce4c6170226235b896a62cac.tar.gz upstream-8ffb10c8b8225651ce4c6170226235b896a62cac.tar.bz2 upstream-8ffb10c8b8225651ce4c6170226235b896a62cac.zip |
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/820-wgt634u-nvram-fix.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.6/820-wgt634u-nvram-fix.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-3.6/820-wgt634u-nvram-fix.patch index 74b17c74e6..745ff501ae 100644 --- a/target/linux/brcm47xx/patches-3.6/820-wgt634u-nvram-fix.patch +++ b/target/linux/brcm47xx/patches-3.6/820-wgt634u-nvram-fix.patch @@ -5,12 +5,11 @@ out the configuration than the in kernel cfe config reader. --- a/arch/mips/bcm47xx/Makefile +++ b/arch/mips/bcm47xx/Makefile -@@ -3,4 +3,4 @@ - # under Linux. - # +@@ -5,3 +5,4 @@ --obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o -+obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o cfe_env.o + obj-y += irq.o nvram.o prom.o serial.o setup.o time.o sprom.o + obj-y += gpio.o ++obj-y += cfe_env.o --- /dev/null +++ b/arch/mips/bcm47xx/cfe_env.c @@ -0,0 +1,229 @@ @@ -281,7 +280,7 @@ out the configuration than the in kernel cfe config reader. /* TODO: when nvram is on nand flash check for bad blocks first. */ off = FLASH_MIN; while (off <= lim) { -@@ -179,6 +201,12 @@ int bcm47xx_nvram_getenv(char *name, cha +@@ -181,6 +203,12 @@ int bcm47xx_nvram_getenv(char *name, cha return err; } @@ -294,7 +293,7 @@ out the configuration than the in kernel cfe config reader. /* Look for name=value and return value */ var = &nvram_buf[sizeof(struct nvram_header)]; end = nvram_buf + sizeof(nvram_buf) - 2; -@@ -207,6 +235,9 @@ char *nvram_get(const char *name) +@@ -209,6 +237,9 @@ char *nvram_get(const char *name) if (!nvram_buf[0]) nvram_init(); |