aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.6
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-12-02 16:11:39 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-12-02 16:11:39 +0000
commit816ed544afc6c03d70c81fb950b0325b49e35bfa (patch)
treececcd05c21996b22fa0b48f41d9f165ba5a69ce2 /target/linux/brcm47xx/patches-3.6
parentb1c02e0ceb2fe0e830a7704f991f71691a4fc6f1 (diff)
downloadupstream-816ed544afc6c03d70c81fb950b0325b49e35bfa.tar.gz
upstream-816ed544afc6c03d70c81fb950b0325b49e35bfa.tar.bz2
upstream-816ed544afc6c03d70c81fb950b0325b49e35bfa.zip
brcm47xx: read sprom vars without prefix for boardrev and boardtype if the prefixed one is not available.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34454 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6')
-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,