aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-06-10 19:52:07 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-06-10 19:52:07 +0000
commitb273bb1896a2bb793a06f2718ab1d8aa313c79d6 (patch)
treed8549a8f7a2cf88a373468081c3eccf21941fe9b /target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
parent4734c4459b2423c07b2752498e9ac2397ae7bfe1 (diff)
downloadupstream-b273bb1896a2bb793a06f2718ab1d8aa313c79d6.tar.gz
upstream-b273bb1896a2bb793a06f2718ab1d8aa313c79d6.tar.bz2
upstream-b273bb1896a2bb793a06f2718ab1d8aa313c79d6.zip
brcm47xx: backport BCM47XX patches (NVRAM & BCMA_HOST_PCI)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45942
Diffstat (limited to 'target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch')
-rw-r--r--target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
index c543e8e2e9..644abde604 100644
--- a/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
+++ b/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
@@ -243,16 +243,16 @@ out the configuration than the in kernel cfe config reader.
+
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
-@@ -36,6 +36,8 @@ struct nvram_header {
-
+@@ -37,6 +37,8 @@ struct nvram_header {
static char nvram_buf[NVRAM_SPACE];
+ static size_t nvram_len;
static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
+static int cfe_env;
+extern char *cfe_env_get(char *nv_buf, const char *name);
static u32 find_nvram_size(void __iomem *end)
{
-@@ -65,6 +67,26 @@ static int nvram_find_and_copy(void __io
+@@ -66,6 +68,26 @@ static int nvram_find_and_copy(void __io
return -EEXIST;
}
@@ -279,7 +279,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) {
-@@ -189,6 +211,13 @@ int bcm47xx_nvram_getenv(const char *nam
+@@ -186,6 +208,13 @@ int bcm47xx_nvram_getenv(const char *nam
return err;
}