diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-05-18 16:04:10 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-05-18 16:04:10 +0000 |
| commit | 6a07b477c06ea67803ef3e497a041f8a6b12b7ed (patch) | |
| tree | 17df38a6ed1b3fa6d6e9b319ea1ecda647574b51 /target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch | |
| parent | 1dd74eea6bf236fac46ba9949e75214763ddd03f (diff) | |
| download | upstream-6a07b477c06ea67803ef3e497a041f8a6b12b7ed.tar.gz upstream-6a07b477c06ea67803ef3e497a041f8a6b12b7ed.tar.bz2 upstream-6a07b477c06ea67803ef3e497a041f8a6b12b7ed.zip | |
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.patch | 6 |
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; |