summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-18 16:04:10 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-18 16:04:10 +0000
commit5ce0dd5cbe37650005ed38a898855688a1b41f4b (patch)
tree17df38a6ed1b3fa6d6e9b319ea1ecda647574b51 /target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch
parent1b9dfb678ca2559c521591cda6c8d7bfb3ab06df (diff)
brcm47xx: fix nvram read out on devices with serial flash
detect nvram on Linksys E3200 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31790 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch b/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch
index 03dd321b16..00f3311a0d 100644
--- a/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch
+++ b/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch
@@ -46,7 +46,7 @@
static char nvram_buf[NVRAM_SPACE];
-@@ -134,6 +136,51 @@ found:
+@@ -139,6 +141,51 @@ static int early_nvram_init_sflash(void)
return 0;
}
@@ -64,7 +64,7 @@
+ /* check if the struct is already initilized */
+ if (!flash_size)
+ return -1;
-+
++
+ cfe_env = 0;
+
+ off = FLASH_MIN;
@@ -98,7 +98,7 @@
#ifdef CONFIG_BCM47XX_SSB
static void early_nvram_init_ssb(void)
{
-@@ -168,6 +215,11 @@ static void early_nvram_init_bcma(void)
+@@ -173,6 +220,11 @@ static void early_nvram_init_bcma(void)
if (err < 0)
printk(KERN_WARNING "can not read from flash: %i\n", err);
break;