Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
SVN-Revision: 36234
This commit is contained in:
Hauke Mehrtens 2013-04-06 19:02:25 +00:00
parent d45ef216e6
commit 204bde8d98
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/brcm47xx/patches-3.6/260-MIPS-BCM47XX-add-board-detection.patch
View file

@ -8,7 +8,7 @@
obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o
--- /dev/null --- /dev/null
+++ b/arch/mips/bcm47xx/board.c +++ b/arch/mips/bcm47xx/board.c
@@ -0,0 +1,220 @@ @@ -0,0 +1,222 @@
+#include <linux/export.h> +#include <linux/export.h>
+#include <linux/string.h> +#include <linux/string.h>
+#include <bcm47xx_board.h> +#include <bcm47xx_board.h>
@ -209,8 +209,10 @@
+ if (bcm47xx_board != NULL) + if (bcm47xx_board != NULL)
+ return; + return;
+ /* check if the nvram is available */ + /* 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; + return;
+ }
+ +
+ bcm47xx_board = bcm47xx_board_get_nvram(); + bcm47xx_board = bcm47xx_board_get_nvram();
+ pr_info("Found board: \"%s\"\n", bcm47xx_board->name); + pr_info("Found board: \"%s\"\n", bcm47xx_board->name);

6
target/linux/brcm47xx/patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch
View file

@ -8,7 +8,7 @@
obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o
--- /dev/null --- /dev/null
+++ b/arch/mips/bcm47xx/board.c +++ b/arch/mips/bcm47xx/board.c
@@ -0,0 +1,220 @@ @@ -0,0 +1,222 @@
+#include <linux/export.h> +#include <linux/export.h>
+#include <linux/string.h> +#include <linux/string.h>
+#include <bcm47xx_board.h> +#include <bcm47xx_board.h>
@ -209,8 +209,10 @@
+ if (bcm47xx_board != NULL) + if (bcm47xx_board != NULL)
+ return; + return;
+ /* check if the nvram is available */ + /* 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; + return;
+ }
+ +
+ bcm47xx_board = bcm47xx_board_get_nvram(); + bcm47xx_board = bcm47xx_board_get_nvram();
+ pr_info("Found board: \"%s\"\n", bcm47xx_board->name); + pr_info("Found board: \"%s\"\n", bcm47xx_board->name);