From 204bde8d98c3ef9e0c03c55ed6700f4deaa1089a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 6 Apr 2013 19:02:25 +0000 Subject: [PATCH] brcm47xx: fix error in board detection when nvram is not available. SVN-Revision: 36234 --- .../patches-3.6/260-MIPS-BCM47XX-add-board-detection.patch | 6 ++++-- .../patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) 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 +#include +#include @@ -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 +#include +#include @@ -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); -- 2.25.1