diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-04-07 12:54:23 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-04-07 12:54:23 +0000 |
| commit | dc4363da2f85eafea2d7eeba7f13f94cdff12556 (patch) | |
| tree | 4a80bac0ec92271c069ffa9997365f56e1550a7e /target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch | |
| parent | b5f93e8c0a9ab2d1580a5fdb37ae37492f84b853 (diff) | |
| download | upstream-dc4363da2f85eafea2d7eeba7f13f94cdff12556.tar.gz upstream-dc4363da2f85eafea2d7eeba7f13f94cdff12556.tar.bz2 upstream-dc4363da2f85eafea2d7eeba7f13f94cdff12556.zip | |
brcm47xx: backport MIPS BCM47XX patches queued for 4.1
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45288 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch index 818641bcbe..714fb6d18a 100644 --- a/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch +++ b/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch @@ -243,7 +243,7 @@ out the configuration than the in kernel cfe config reader. + --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c -@@ -33,6 +33,8 @@ struct nvram_header { +@@ -36,6 +36,8 @@ struct nvram_header { static char nvram_buf[NVRAM_SPACE]; static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000}; @@ -252,7 +252,7 @@ out the configuration than the in kernel cfe config reader. static u32 find_nvram_size(void __iomem *end) { -@@ -62,6 +64,26 @@ static int nvram_find_and_copy(void __io +@@ -65,6 +67,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 +@@ -181,6 +203,13 @@ int bcm47xx_nvram_getenv(const char *nam return err; } |