ssb: Update to latest upstream version of ssb.

SVN-Revision: 10490

1 files changed, 26 insertions, 22 deletions

diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
index 008634a..2fcf684 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
+++ b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
@@ -94,49 +94,53 @@ static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
 
 	sprom->revision = 1;
 	if ((s = nvram_get("il0macaddr")))
-		e_aton(s, sprom->r1.il0mac);
+		e_aton(s, sprom->il0mac);
 	if ((s = nvram_get("et0macaddr")))
-		e_aton(s, sprom->r1.et0mac);
+		e_aton(s, sprom->et0mac);
 	if ((s = nvram_get("et1macaddr")))
-		e_aton(s, sprom->r1.et1mac);
+		e_aton(s, sprom->et1mac);
 	if ((s = nvram_get("et0phyaddr")))
-		sprom->r1.et0phyaddr = simple_strtoul(s, NULL, 0);
+		sprom->et0phyaddr = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("et1phyaddr")))
-		sprom->r1.et1phyaddr = simple_strtoul(s, NULL, 0);
+		sprom->et1phyaddr = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("et0mdcport")))
-		sprom->r1.et0mdcport = !!simple_strtoul(s, NULL, 10);
+		sprom->et0mdcport = !!simple_strtoul(s, NULL, 10);
 	if ((s = nvram_get("et1mdcport")))
-		sprom->r1.et1mdcport = !!simple_strtoul(s, NULL, 10);
+		sprom->et1mdcport = !!simple_strtoul(s, NULL, 10);
 	if ((s = nvram_get("pa0b0")))
-		sprom->r1.pa0b0 = simple_strtoul(s, NULL, 0);
+		sprom->pa0b0 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("pa0b1")))
-		sprom->r1.pa0b1 = simple_strtoul(s, NULL, 0);
+		sprom->pa0b1 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("pa0b2")))
-		sprom->r1.pa0b2 = simple_strtoul(s, NULL, 0);
+		sprom->pa0b2 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("pa1b0")))
-		sprom->r1.pa1b0 = simple_strtoul(s, NULL, 0);
+		sprom->pa1b0 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("pa1b1")))
-		sprom->r1.pa1b1 = simple_strtoul(s, NULL, 0);
+		sprom->pa1b1 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("pa1b2")))
-		sprom->r1.pa1b2 = simple_strtoul(s, NULL, 0);
+		sprom->pa1b2 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("wl0gpio0")))
-		sprom->r1.gpio0 = simple_strtoul(s, NULL, 0);
+		sprom->gpio0 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("wl0gpio1")))
-		sprom->r1.gpio1 = simple_strtoul(s, NULL, 0);
+		sprom->gpio1 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("wl0gpio2")))
-		sprom->r1.gpio2 = simple_strtoul(s, NULL, 0);
+		sprom->gpio2 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("wl0gpio3")))
-		sprom->r1.gpio3 = simple_strtoul(s, NULL, 0);
+		sprom->gpio3 = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("pa0maxpwr")))
-		sprom->r1.maxpwr_bg = simple_strtoul(s, NULL, 0);
+		sprom->maxpwr_bg = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("pa1maxpwr")))
-		sprom->r1.maxpwr_a = simple_strtoul(s, NULL, 0);
+		sprom->maxpwr_a = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("pa0itssit")))
-		sprom->r1.itssi_bg = simple_strtoul(s, NULL, 0);
+		sprom->itssi_bg = simple_strtoul(s, NULL, 0);
 	if ((s = nvram_get("pa1itssit")))
-		sprom->r1.itssi_a = simple_strtoul(s, NULL, 0);
+		sprom->itssi_a = simple_strtoul(s, NULL, 0);
+	sprom->boardflags_lo = 0;
 	if ((s = nvram_get("boardflags")))
-		sprom->r1.boardflags_lo = simple_strtoul(s, NULL, 0);
+		sprom->boardflags_lo = simple_strtoul(s, NULL, 0);
+	sprom->boardflags_hi = 0;
+	if ((s = nvram_get("boardflags2")))
+		sprom->boardflags_hi = simple_strtoul(s, NULL, 0);
 }
 
 static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv)