diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-06-10 19:52:07 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-06-10 19:52:07 +0000 |
| commit | 710a339e2602831e4ca7619d29008459f1f59ff7 (patch) | |
| tree | 50dc7dbb982354ac7b228ab71feb4e75323046cd /target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch | |
| parent | c894b37c47e01de924b5ef52fb414599fcc42fd6 (diff) | |
| download | upstream-710a339e2602831e4ca7619d29008459f1f59ff7.tar.gz upstream-710a339e2602831e4ca7619d29008459f1f59ff7.tar.bz2 upstream-710a339e2602831e4ca7619d29008459f1f59ff7.zip | |
brcm47xx: backport BCM47XX patches (NVRAM & BCMA_HOST_PCI)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45942 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 8 |
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; } |