brcm47xx: backport MIPS BCM47XX patches queued for 4.1

[openwrt/openwrt.git] / target / linux / brcm47xx / patches-3.18 / 820-wgt634u-nvram-fix.patch

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 818641bcbe75fd4340e07b3def6de6ab2157a1a0..714fb6d18a7505e8281cce8b6d6f298efe076117 100644 (file)
--- 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;
        }