From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 6 Apr 2013 19:02:25 +0000 (+0000)
Subject: brcm47xx: fix error in board detection when nvram is not available.
X-Git-Tag: reboot~10750
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=204bde8d98c3ef9e0c03c55ed6700f4deaa1089a;p=openwrt%2Fstaging%2Fjogo.git

brcm47xx: fix error in board detection when nvram is not available.

SVN-Revision: 36234
---

diff --git a/target/linux/brcm47xx/patches-3.6/260-MIPS-BCM47XX-add-board-detection.patch b/target/linux/brcm47xx/patches-3.6/260-MIPS-BCM47XX-add-board-detection.patch
index ec307b1b68..08c0a979ae 100644
--- a/target/linux/brcm47xx/patches-3.6/260-MIPS-BCM47XX-add-board-detection.patch
+++ b/target/linux/brcm47xx/patches-3.6/260-MIPS-BCM47XX-add-board-detection.patch
@@ -8,7 +8,7 @@
  obj-$(CONFIG_BCM47XX_SSB)	+= wgt634u.o
 --- /dev/null
 +++ b/arch/mips/bcm47xx/board.c
-@@ -0,0 +1,220 @@
+@@ -0,0 +1,222 @@
 +#include <linux/export.h>
 +#include <linux/string.h>
 +#include <bcm47xx_board.h>
@@ -209,8 +209,10 @@
 +	if (bcm47xx_board != NULL)
 +		return;
 +	/* check if the nvram is available */
-+	if (bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)) == -ENXIO)
++	if (bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)) == -ENXIO) {
++		bcm47xx_board = bcm47xx_board_unknown;
 +		return;
++	}
 +
 +	bcm47xx_board = bcm47xx_board_get_nvram();
 +	pr_info("Found board: \"%s\"\n", bcm47xx_board->name);
diff --git a/target/linux/brcm47xx/patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch b/target/linux/brcm47xx/patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch
index ec307b1b68..08c0a979ae 100644
--- a/target/linux/brcm47xx/patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch
+++ b/target/linux/brcm47xx/patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch
@@ -8,7 +8,7 @@
  obj-$(CONFIG_BCM47XX_SSB)	+= wgt634u.o
 --- /dev/null
 +++ b/arch/mips/bcm47xx/board.c
-@@ -0,0 +1,220 @@
+@@ -0,0 +1,222 @@
 +#include <linux/export.h>
 +#include <linux/string.h>
 +#include <bcm47xx_board.h>
@@ -209,8 +209,10 @@
 +	if (bcm47xx_board != NULL)
 +		return;
 +	/* check if the nvram is available */
-+	if (bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)) == -ENXIO)
++	if (bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)) == -ENXIO) {
++		bcm47xx_board = bcm47xx_board_unknown;
 +		return;
++	}
 +
 +	bcm47xx_board = bcm47xx_board_get_nvram();
 +	pr_info("Found board: \"%s\"\n", bcm47xx_board->name);