diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-06 19:02:25 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-06 19:02:25 +0000 |
| commit | 5a868416ddb0ff310b31d9860bb3c83f36ea2627 (patch) | |
| tree | 02c856969485224978caa31e12cec00238e0eeb1 | |
| parent | ed056fe820bf0731abeaa262528a8d9f76add6b1 (diff) | |
brcm47xx: fix error in board detection when nvram is not available.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36234 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/260-MIPS-BCM47XX-add-board-detection.patch | 6 | ||||
| -rw-r--r-- | target/linux/brcm47xx/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 ec307b1b6..08c0a979a 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 ec307b1b6..08c0a979a 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); |