brcm47xx: update board detection patch

* Use different structs depending on the number of nvram variables to check.
* Add detection of ZTE H218N, this closes #14151.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37996 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm47xx/patches-3.10/260-MIPS-BCM47XX-add-board-detection.patch b/target/linux/brcm47xx/patches-3.10/260-MIPS-BCM47XX-add-board-detection.patch
index 2ab99c5..aa63f45 100644 (file)
--- a/target/linux/brcm47xx/patches-3.10/260-MIPS-BCM47XX-add-board-detection.patch
+++ b/target/linux/brcm47xx/patches-3.10/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,243 @@
+@@ -0,0 +1,285 @@
 +#include <linux/export.h>
 +#include <linux/string.h>
 +#include <bcm47xx_board.h>
@@ -19,85 +19,105 @@
 +      const char *name;
 +};
 +
-+struct bcm47xx_board_type_list {
++struct bcm47xx_board_type_list1 {
++      struct bcm47xx_board_type board;
++      const char *value1;
++};
++
++struct bcm47xx_board_type_list2 {
++      struct bcm47xx_board_type board;
++      const char *value1;
++      const char *value2;
++};
++
++struct bcm47xx_board_type_list3 {
 +      struct bcm47xx_board_type board;
 +      const char *value1;
 +      const char *value2;
++      const char *value3;
 +};
 +
 +static const struct bcm47xx_board_type *bcm47xx_board = NULL;
 +
-+static const struct bcm47xx_board_type_list bcm47xx_board_list_model_name[] = {
-+      {{BCM47XX_BOARD_DLINK_DIR130, "D-Link DIR-130"}, "DIR-130",},
-+      {{BCM47XX_BOARD_DLINK_DIR330, "D-Link DIR-330"}, "DIR-330",},
++/* model_name */
++static const struct bcm47xx_board_type_list1 bcm47xx_board_list_model_name[] = {
++      {{BCM47XX_BOARD_DLINK_DIR130, "D-Link DIR-130"}, "DIR-130"},
++      {{BCM47XX_BOARD_DLINK_DIR330, "D-Link DIR-330"}, "DIR-330"},
 +      { {0}, 0},
 +};
 +
-+static const struct bcm47xx_board_type_list bcm47xx_board_list_model_no[] = {
-+      {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "WL700",},
++/* model_no */
++static const struct bcm47xx_board_type_list1 bcm47xx_board_list_model_no[] = {
++      {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "WL700"},
 +      { {0}, 0},
 +};
 +
-+static const struct bcm47xx_board_type_list bcm47xx_board_list_machine_name[] = {
-+      {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "WRTSL54GS",},
++/* machine_name */
++static const struct bcm47xx_board_type_list1 bcm47xx_board_list_machine_name[] = {
++      {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "WRTSL54GS"},
 +      { {0}, 0},
 +};
 +
-+static const struct bcm47xx_board_type_list bcm47xx_board_list_hardware_version[] = {
-+      {{BCM47XX_BOARD_ASUS_RTN16, "Asus RT-N16"}, "RT-N16-",},
-+      {{BCM47XX_BOARD_ASUS_WL320GE, "Asus WL320GE"}, "WL320G-",},
-+      {{BCM47XX_BOARD_ASUS_WL330GE, "Asus WL330GE"}, "WL330GE-",},
-+      {{BCM47XX_BOARD_ASUS_WL500GD, "Asus WL500GD"}, "WL500gd-",},
-+      {{BCM47XX_BOARD_ASUS_WL500GPV1, "Asus WL500GP V1"}, "WL500gp-",},
-+      {{BCM47XX_BOARD_ASUS_WL500GPV2, "Asus WL500GP V2"}, "WL500GPV2-",},
-+      {{BCM47XX_BOARD_ASUS_WL500W, "Asus WL500W"}, "WL500gW-",},
-+      {{BCM47XX_BOARD_ASUS_WL520GC, "Asus WL520GC"}, "WL520GC-",},
-+      {{BCM47XX_BOARD_ASUS_WL520GU, "Asus WL520GU"}, "WL520GU-",},
-+      {{BCM47XX_BOARD_BELKIN_F7D4301, "Belkin F7D4301"}, "F7D4301",},
++/* hardware_version */
++static const struct bcm47xx_board_type_list1 bcm47xx_board_list_hardware_version[] = {
++      {{BCM47XX_BOARD_ASUS_RTN16, "Asus RT-N16"}, "RT-N16-"},
++      {{BCM47XX_BOARD_ASUS_WL320GE, "Asus WL320GE"}, "WL320G-"},
++      {{BCM47XX_BOARD_ASUS_WL330GE, "Asus WL330GE"}, "WL330GE-"},
++      {{BCM47XX_BOARD_ASUS_WL500GD, "Asus WL500GD"}, "WL500gd-"},
++      {{BCM47XX_BOARD_ASUS_WL500GPV1, "Asus WL500GP V1"}, "WL500gp-"},
++      {{BCM47XX_BOARD_ASUS_WL500GPV2, "Asus WL500GP V2"}, "WL500GPV2-"},
++      {{BCM47XX_BOARD_ASUS_WL500W, "Asus WL500W"}, "WL500gW-"},
++      {{BCM47XX_BOARD_ASUS_WL520GC, "Asus WL520GC"}, "WL520GC-"},
++      {{BCM47XX_BOARD_ASUS_WL520GU, "Asus WL520GU"}, "WL520GU-"},
++      {{BCM47XX_BOARD_BELKIN_F7D4301, "Belkin F7D4301"}, "F7D4301"},
 +      { {0}, 0},
 +};
 +
-+static const struct bcm47xx_board_type_list bcm47xx_board_list_productid[] = {
-+      {{BCM47XX_BOARD_ASUS_RTAC66U, "Asus RT-AC66U"}, "RT-AC66U",},
-+      {{BCM47XX_BOARD_ASUS_RTN10, "Asus RT-N10"}, "RT-N10",},
-+      {{BCM47XX_BOARD_ASUS_RTN10D, "Asus RT-N10D"}, "RT-N10D",},
-+      {{BCM47XX_BOARD_ASUS_RTN10U, "Asus RT-N10U"}, "RT-N10U",},
-+      {{BCM47XX_BOARD_ASUS_RTN12, "Asus RT-N12"}, "RT-N12",},
-+      {{BCM47XX_BOARD_ASUS_RTN12B1, "Asus RT-N12B1"}, "RT-N12B1",},
-+      {{BCM47XX_BOARD_ASUS_RTN12C1, "Asus RT-N12C1"}, "RT-N12C1",},
-+      {{BCM47XX_BOARD_ASUS_RTN12D1, "Asus RT-N12D1"}, "RT-N12D1",},
-+      {{BCM47XX_BOARD_ASUS_RTN12HP, "Asus RT-N12HP"}, "RT-N12HP",},
-+      {{BCM47XX_BOARD_ASUS_RTN15U, "Asus RT-N15U"}, "RT-N15U",},
-+      {{BCM47XX_BOARD_ASUS_RTN16, "Asus RT-N16"}, "RT-N16",},
-+      {{BCM47XX_BOARD_ASUS_RTN53, "Asus RT-N53"}, "RT-N53",},
-+      {{BCM47XX_BOARD_ASUS_RTN66U, "Asus RT-N66U"}, "RT-N66U",},
-+      {{BCM47XX_BOARD_ASUS_WL300G, "Asus WL300G"}, "WL300g",},
-+      {{BCM47XX_BOARD_ASUS_WLHDD, "Asus WLHDD"}, "WLHDD",},
++/* productid */
++static const struct bcm47xx_board_type_list1 bcm47xx_board_list_productid[] = {
++      {{BCM47XX_BOARD_ASUS_RTAC66U, "Asus RT-AC66U"}, "RT-AC66U"},
++      {{BCM47XX_BOARD_ASUS_RTN10, "Asus RT-N10"}, "RT-N10"},
++      {{BCM47XX_BOARD_ASUS_RTN10D, "Asus RT-N10D"}, "RT-N10D"},
++      {{BCM47XX_BOARD_ASUS_RTN10U, "Asus RT-N10U"}, "RT-N10U"},
++      {{BCM47XX_BOARD_ASUS_RTN12, "Asus RT-N12"}, "RT-N12"},
++      {{BCM47XX_BOARD_ASUS_RTN12B1, "Asus RT-N12B1"}, "RT-N12B1"},
++      {{BCM47XX_BOARD_ASUS_RTN12C1, "Asus RT-N12C1"}, "RT-N12C1"},
++      {{BCM47XX_BOARD_ASUS_RTN12D1, "Asus RT-N12D1"}, "RT-N12D1"},
++      {{BCM47XX_BOARD_ASUS_RTN12HP, "Asus RT-N12HP"}, "RT-N12HP"},
++      {{BCM47XX_BOARD_ASUS_RTN15U, "Asus RT-N15U"}, "RT-N15U"},
++      {{BCM47XX_BOARD_ASUS_RTN16, "Asus RT-N16"}, "RT-N16"},
++      {{BCM47XX_BOARD_ASUS_RTN53, "Asus RT-N53"}, "RT-N53"},
++      {{BCM47XX_BOARD_ASUS_RTN66U, "Asus RT-N66U"}, "RT-N66U"},
++      {{BCM47XX_BOARD_ASUS_WL300G, "Asus WL300G"}, "WL300g"},
++      {{BCM47XX_BOARD_ASUS_WLHDD, "Asus WLHDD"}, "WLHDD"},
 +      { {0}, 0},
 +};
 +
-+static const struct bcm47xx_board_type_list bcm47xx_board_list_ModelId[] = {
-+      {{BCM47XX_BOARD_DELL_TM2300, "Dell WX-5565"}, "WX-5565",},
-+      {{BCM47XX_BOARD_MOTOROLA_WE800G, "Motorola WE800G"}, "WE800G",},
-+      {{BCM47XX_BOARD_MOTOROLA_WR850GP, "Motorola WR850GP"}, "WR850GP",},
-+      {{BCM47XX_BOARD_MOTOROLA_WR850GV2V3, "Motorola WR850G"}, "WR850G",},
++/* ModelId */
++static const struct bcm47xx_board_type_list1 bcm47xx_board_list_ModelId[] = {
++      {{BCM47XX_BOARD_DELL_TM2300, "Dell WX-5565"}, "WX-5565"},
++      {{BCM47XX_BOARD_MOTOROLA_WE800G, "Motorola WE800G"}, "WE800G"},
++      {{BCM47XX_BOARD_MOTOROLA_WR850GP, "Motorola WR850GP"}, "WR850GP"},
++      {{BCM47XX_BOARD_MOTOROLA_WR850GV2V3, "Motorola WR850G"}, "WR850G"},
 +      { {0}, 0},
 +};
 +
-+static const struct bcm47xx_board_type_list bcm47xx_board_list_melco_id[] = {
-+      {{BCM47XX_BOARD_BUFFALO_WBR2_G54, "Buffalo WBR2-G54"}, "29bb0332",},
-+      {{BCM47XX_BOARD_BUFFALO_WHR2_A54G54, "Buffalo WHR2-A54G54"}, "290441dd",},
-+      {{BCM47XX_BOARD_BUFFALO_WHR_G125, "Buffalo WHR-G125"}, "32093",},
-+      {{BCM47XX_BOARD_BUFFALO_WHR_G54S, "Buffalo WHR-G54S"}, "30182",},
-+      {{BCM47XX_BOARD_BUFFALO_WHR_HP_G54, "Buffalo WHR-HP-G54"}, "30189",},
-+      {{BCM47XX_BOARD_BUFFALO_WLA2_G54L, "Buffalo WLA2-G54L"}, "29129",},
-+      {{BCM47XX_BOARD_BUFFALO_WZR_G300N, "Buffalo WZR-G300N"}, "31120",},
-+      {{BCM47XX_BOARD_BUFFALO_WZR_RS_G54, "Buffalo WZR-RS-G54"}, "30083",},
-+      {{BCM47XX_BOARD_BUFFALO_WZR_RS_G54HP, "Buffalo WZR-RS-G54HP"}, "30103",},
++/* melco_id or buf1falo_id */
++static const struct bcm47xx_board_type_list1 bcm47xx_board_list_melco_id[] = {
++      {{BCM47XX_BOARD_BUFFALO_WBR2_G54, "Buffalo WBR2-G54"}, "29bb0332"},
++      {{BCM47XX_BOARD_BUFFALO_WHR2_A54G54, "Buffalo WHR2-A54G54"}, "290441dd"},
++      {{BCM47XX_BOARD_BUFFALO_WHR_G125, "Buffalo WHR-G125"}, "32093"},
++      {{BCM47XX_BOARD_BUFFALO_WHR_G54S, "Buffalo WHR-G54S"}, "30182"},
++      {{BCM47XX_BOARD_BUFFALO_WHR_HP_G54, "Buffalo WHR-HP-G54"}, "30189"},
++      {{BCM47XX_BOARD_BUFFALO_WLA2_G54L, "Buffalo WLA2-G54L"}, "29129"},
++      {{BCM47XX_BOARD_BUFFALO_WZR_G300N, "Buffalo WZR-G300N"}, "31120"},
++      {{BCM47XX_BOARD_BUFFALO_WZR_RS_G54, "Buffalo WZR-RS-G54"}, "30083"},
++      {{BCM47XX_BOARD_BUFFALO_WZR_RS_G54HP, "Buffalo WZR-RS-G54HP"}, "30103"},
 +      { {0}, 0},
 +};
 +
-+static const struct bcm47xx_board_type_list bcm47xx_board_list_boot_hw[] = {
++/* boot_hw_model, boot_hw_ver */
++static const struct bcm47xx_board_type_list2 bcm47xx_board_list_boot_hw[] = {
 +      {{BCM47XX_BOARD_CISCO_M10V1, "Cisco M10"}, "M10", "1.0"}, /* like WRT160N v3.0 */
 +      {{BCM47XX_BOARD_CISCO_M20V1, "Cisco M20"}, "M20", "1.0"}, /* like WRT310N v2.0 */
 +      {{BCM47XX_BOARD_LINKSYS_E1000V1, "Linksys E1000 V1"}, "E100", "1.0"},  /* like WRT160N v3.0 */
@@ -120,23 +140,30 @@
 +      { {0}, 0},
 +};
 +
-+static const struct bcm47xx_board_type_list bcm47xx_board_list_board_id[] = {
-+      {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR3400VCNA, "Netgear WNDR3400 Vcna"}, "U12H155T01_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR3700V3, "Netgear WNDR3700 V3"}, "U12H194T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNR3500V2, "Netgear WNR3500 V2"}, "U12H127T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNR3500V2VC, "Netgear WNR3500 V2vc"}, "U12H127T70_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNR834BV2, "Netgear WNR834B V2"}, "U12H081T00_NETGEAR",},
++/* board_id */
++static const struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] = {
++      {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNDR3400VCNA, "Netgear WNDR3400 Vcna"}, "U12H155T01_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNDR3700V3, "Netgear WNDR3700 V3"}, "U12H194T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNR3500V2, "Netgear WNR3500 V2"}, "U12H127T00_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNR3500V2VC, "Netgear WNR3500 V2vc"}, "U12H127T70_NETGEAR"},
++      {{BCM47XX_BOARD_NETGEAR_WNR834BV2, "Netgear WNR834B V2"}, "U12H081T00_NETGEAR"},
++      { {0}, 0},
++};
++
++/* boardtype, boardnum, boardrev */
++static const struct bcm47xx_board_type_list3 bcm47xx_board_list_board[] = {
++      {{BCM47XX_BOARD_ZTE_H218N, "ZTE H218N"}, "0x053d", "1234", "0x1305"},
 +      { {0}, 0},
 +};
 +
@@ -153,71 +180,86 @@
 +{
 +      char buf1[30];
 +      char buf2[30];
-+      const struct bcm47xx_board_type_list *e;
++      char buf3[30];
++      const struct bcm47xx_board_type_list1 *e1;
++      const struct bcm47xx_board_type_list2 *e2;
++      const struct bcm47xx_board_type_list3 *e3;
 +
 +      if (bcm47xx_nvram_getenv("model_name", buf1, sizeof(buf1)) >= 0) {
-+              for (e = bcm47xx_board_list_model_name; e->value1; e++) {
-+                      if (!strcmp(buf1, e->value1))
-+                              return &e->board;
++              for (e1 = bcm47xx_board_list_model_name; e1->value1; e1++) {
++                      if (!strcmp(buf1, e1->value1))
++                              return &e1->board;
 +              }
 +      }
 +
 +      if (bcm47xx_nvram_getenv("model_no", buf1, sizeof(buf1)) >= 0) {
-+              for (e = bcm47xx_board_list_model_no; e->value1; e++) {
-+                      if (strstarts(buf1, e->value1))
-+                              return &e->board;
++              for (e1 = bcm47xx_board_list_model_no; e1->value1; e1++) {
++                      if (strstarts(buf1, e1->value1))
++                              return &e1->board;
 +              }
 +      }
 +
 +      if (bcm47xx_nvram_getenv("machine_name", buf1, sizeof(buf1)) >= 0) {
-+              for (e = bcm47xx_board_list_machine_name; e->value1; e++) {
-+                      if (strstarts(buf1, e->value1))
-+                              return &e->board;
++              for (e1 = bcm47xx_board_list_machine_name; e1->value1; e1++) {
++                      if (strstarts(buf1, e1->value1))
++                              return &e1->board;
 +              }
 +      }
 +
 +      if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0) {
-+              for (e = bcm47xx_board_list_hardware_version; e->value1; e++) {
-+                      if (strstarts(buf1, e->value1))
-+                              return &e->board;
++              for (e1 = bcm47xx_board_list_hardware_version; e1->value1; e1++) {
++                      if (strstarts(buf1, e1->value1))
++                              return &e1->board;
 +              }
 +      }
 +
 +      if (bcm47xx_nvram_getenv("productid", buf1, sizeof(buf1)) >= 0) {
-+              for (e = bcm47xx_board_list_productid; e->value1; e++) {
-+                      if (!strcmp(buf1, e->value1))
-+                              return &e->board;
++              for (e1 = bcm47xx_board_list_productid; e1->value1; e1++) {
++                      if (!strcmp(buf1, e1->value1))
++                              return &e1->board;
 +              }
 +      }
 +
 +      if (bcm47xx_nvram_getenv("ModelId", buf1, sizeof(buf1)) >= 0) {
-+              for (e = bcm47xx_board_list_ModelId; e->value1; e++) {
-+                      if (!strcmp(buf1, e->value1))
-+                              return &e->board;
++              for (e1 = bcm47xx_board_list_ModelId; e1->value1; e1++) {
++                      if (!strcmp(buf1, e1->value1))
++                              return &e1->board;
 +              }
 +      }
 +
 +      if (bcm47xx_nvram_getenv("melco_id", buf1, sizeof(buf1)) >= 0 ||
 +          bcm47xx_nvram_getenv("buf1falo_id", buf1, sizeof(buf1)) >= 0) {
 +              /* buffalo hardware, check id for specific hardware matches */
-+              for (e = bcm47xx_board_list_melco_id; e->value1; e++) {
-+                      if (!strcmp(buf1, e->value1))
-+                              return &e->board;
++              for (e1 = bcm47xx_board_list_melco_id; e1->value1; e1++) {
++                      if (!strcmp(buf1, e1->value1))
++                              return &e1->board;
 +              }
 +      }
 +
 +      if (bcm47xx_nvram_getenv("boot_hw_model", buf1, sizeof(buf1)) >= 0 &&
 +          bcm47xx_nvram_getenv("boot_hw_ver", buf2, sizeof(buf2)) >= 0) {
-+              for (e = bcm47xx_board_list_boot_hw; e->value1; e++) {
-+                      if (!strcmp(buf1, e->value1) && !strcmp(buf2, e->value2))
-+                              return &e->board;
++              for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) {
++                      if (!strcmp(buf1, e2->value1) &&
++                          !strcmp(buf2, e2->value2))
++                              return &e2->board;
 +              }
 +      }
 +
 +      if (bcm47xx_nvram_getenv("board_id", buf1, sizeof(buf1)) >= 0) {
-+              for (e = bcm47xx_board_list_board_id; e->value1; e++) {
-+                      if (!strcmp(buf1, e->value1))
-+                              return &e->board;
++              for (e1 = bcm47xx_board_list_board_id; e1->value1; e1++) {
++                      if (!strcmp(buf1, e1->value1))
++                              return &e1->board;
++              }
++      }
++
++      if (bcm47xx_nvram_getenv("boardtype", buf1, sizeof(buf1)) >= 0 &&
++          bcm47xx_nvram_getenv("boardnum", buf2, sizeof(buf2)) >= 0 &&
++          bcm47xx_nvram_getenv("boardrev", buf3, sizeof(buf3)) >= 0) {
++              for (e3 = bcm47xx_board_list_board; e3->value1; e3++) {
++                      if (!strcmp(buf1, e3->value1) &&
++                          !strcmp(buf2, e3->value2) &&
++                          !strcmp(buf3, e3->value3))
++                              return &e3->board;
 +              }
 +      }
 +      return bcm47xx_board_unknown;
@@ -254,7 +296,7 @@
 +EXPORT_SYMBOL(bcm47xx_board_get_name);
 --- /dev/null
 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,102 @@
 +#ifndef __BCM47XX_BOARD_H
 +#define __BCM47XX_BOARD_H
 +
@@ -347,6 +389,8 @@
 +      /* TODO */
 +      BCM47XX_BOARD_SIMPLETECH_SIMPLESHARE,
 +
++      BCM47XX_BOARD_ZTE_H218N,
++
 +      BCM47XX_BOARD_UNKNOWN,
 +      BCM47XX_BOARD_NON,
 +};