From c5f719ff6aaf3cc957e169533e99bf5b7cf05d38 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 29 Apr 2012 02:04:09 +0200 Subject: [PATCH] --- yaml --- r: 306747 b: refs/heads/master c: a25595562291baea4ccc2ed570dd15c638b67b21 h: refs/heads/master i: 306745: 2fa7aa84f870ccc791c23de0897b3780210ea977 306743: b1cea70e1223d1817b619301613b7e0dc36c4054 v: v3 --- [refs] | 2 +- trunk/arch/mips/bcm47xx/sprom.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bfd862e910ef..4aa33ffb2fa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a2fcaa70ce96be6e663234072984fd2b0ffa36e +refs/heads/master: a25595562291baea4ccc2ed570dd15c638b67b21 diff --git a/trunk/arch/mips/bcm47xx/sprom.c b/trunk/arch/mips/bcm47xx/sprom.c index a29d20743039..17282e0d7835 100644 --- a/trunk/arch/mips/bcm47xx/sprom.c +++ b/trunk/arch/mips/bcm47xx/sprom.c @@ -165,6 +165,8 @@ static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom, const char *prefix) { nvram_read_u16(prefix, NULL, "boardrev", &sprom->board_rev, 0); + if (!sprom->board_rev) + nvram_read_u16(NULL, NULL, "boardrev", &sprom->board_rev, 0); nvram_read_u16(prefix, NULL, "boardnum", &sprom->board_num, 0); nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff); nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff);