diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-05-06 05:54:19 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-05-06 05:54:19 +0000 |
| commit | 559da27e07d14414d0ddd1b4dfbc8da5fb1b91de (patch) | |
| tree | 15dacd9d8557e01dc025abca7621a4b09c1d9866 /target/linux | |
| parent | ad6c82948fada48f9571d582c436f840ccb83fd7 (diff) | |
| download | upstream-559da27e07d14414d0ddd1b4dfbc8da5fb1b91de.tar.gz upstream-559da27e07d14414d0ddd1b4dfbc8da5fb1b91de.tar.bz2 upstream-559da27e07d14414d0ddd1b4dfbc8da5fb1b91de.zip | |
brcm47xx: fix regression in NVRAM support for WGT634U
We were calculating wrong offset, NVRAM wasn't found and OpenWrt didn't
boot.
Fixes: 9019803 ("brcm47xx: backport BCM47XX arch patches (clean NVRAM code, later init)")
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45618 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch | 4 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch | 4 |
2 files changed, 4 insertions, 4 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 714fb6d18a..51ff74301a 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 @@ -260,8 +260,8 @@ out the configuration than the in kernel cfe config reader. + + /* XXX: hack for supporting the CFE environment stuff on WGT634U */ + if (lim >= 8 * 1024 * 1024) { -+ src = (u32 *) iobase + 8 * 1024 * 1024 - 0x2000; -+ dst = (u32 *) nvram_buf; ++ src = (u32 *)(iobase + 8 * 1024 * 1024 - 0x2000); ++ dst = (u32 *)nvram_buf; + + if ((*src & 0xff00ff) == 0x000001) { + printk("early_nvram_init: WGT634U NVRAM found.\n"); 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 714fb6d18a..51ff74301a 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 @@ -260,8 +260,8 @@ out the configuration than the in kernel cfe config reader. + + /* XXX: hack for supporting the CFE environment stuff on WGT634U */ + if (lim >= 8 * 1024 * 1024) { -+ src = (u32 *) iobase + 8 * 1024 * 1024 - 0x2000; -+ dst = (u32 *) nvram_buf; ++ src = (u32 *)(iobase + 8 * 1024 * 1024 - 0x2000); ++ dst = (u32 *)nvram_buf; + + if ((*src & 0xff00ff) == 0x000001) { + printk("early_nvram_init: WGT634U NVRAM found.\n"); |