Author: rmilecki
Date: 2015-05-06 07:54:19 +0200 (Wed, 06 May 2015)
New Revision: 45618
Modified:
trunk/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch
trunk/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
Log:
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?\197?\130 Mi?\197?\130ecki <[email protected]>
Modified: trunk/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch
===================================================================
--- trunk/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch
2015-05-06 00:59:41 UTC (rev 45617)
+++ trunk/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch
2015-05-06 05:54:19 UTC (rev 45618)
@@ -260,8 +260,8 @@
+
+ /* 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");
Modified: trunk/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
===================================================================
--- trunk/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
2015-05-06 00:59:41 UTC (rev 45617)
+++ trunk/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
2015-05-06 05:54:19 UTC (rev 45618)
@@ -260,8 +260,8 @@
+
+ /* 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");
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
