aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-12-02 16:11:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-12-02 16:11:39 +0000
commit2ac9ac5163ddfebcda61461e09267b0e6551cb71 (patch)
tree4815ee3b4875d6ea943f8635e4997ad46aa42bb0
parent9362c121c8d3fb502e29c9f3a2962fe5ef237707 (diff)
downloadupstream-2ac9ac5163ddfebcda61461e09267b0e6551cb71.tar.gz
upstream-2ac9ac5163ddfebcda61461e09267b0e6551cb71.tar.bz2
upstream-2ac9ac5163ddfebcda61461e09267b0e6551cb71.zip
brcm47xx: read sprom vars without prefix for boardrev and boardtype if the prefixed one is not available.
SVN-Revision: 34454
-rw-r--r--target/linux/brcm47xx/patches-3.6/200-MIPS-BCM47XX-use-fallback-for-some-board.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/200-MIPS-BCM47XX-use-fallback-for-some-board.patch b/target/linux/brcm47xx/patches-3.6/200-MIPS-BCM47XX-use-fallback-for-some-board.patch
new file mode 100644
index 0000000000..5d759f1ab6
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.6/200-MIPS-BCM47XX-use-fallback-for-some-board.patch
@@ -0,0 +1,17 @@
+--- a/arch/mips/bcm47xx/sprom.c
++++ b/arch/mips/bcm47xx/sprom.c
+@@ -652,12 +652,10 @@ static void bcm47xx_fill_sprom_ethernet(
+ static void bcm47xx_fill_board_data(struct ssb_sprom *sprom, const char *prefix,
+ bool fallback)
+ {
+- nvram_read_u16(prefix, NULL, "boardrev", &sprom->board_rev, 0,
+- fallback);
++ nvram_read_u16(prefix, NULL, "boardrev", &sprom->board_rev, 0, true);
+ nvram_read_u16(prefix, NULL, "boardnum", &sprom->board_num, 0,
+ fallback);
+- nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0,
+- fallback);
++ nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0, true);
+ nvram_read_u32_2(prefix, "boardflags", &sprom->boardflags_lo,
+ &sprom->boardflags_hi, fallback);
+ nvram_read_u32_2(prefix, "boardflags2", &sprom->boardflags2_lo,