brcm47xx: use same board detection code as kernel 3.8

SVN-Revision: 35770

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 18a3b1afec0e09464b5a7645e33e34d7694c77d5..6edbaed533c6f299e0bd66663e133292b351333a 100644 (file)
--- 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
@@ -41,8 +41,8 @@
 +static const struct bcm47xx_board_type_list bcm47xx_board_list_hardware_version[] = {
 +      {{BCM47XX_BOARD_ASUS_RTN16, "Asus RT-N16"}, "RT-N16-",},
 +      {{BCM47XX_BOARD_ASUS_WL330GE, "Asus WL330GE"}, "WL330GE-",},
-+      {{BCM47XX_BOARD_ASUS_WL500GPV1, "Asus WL500GPV1"}, "WL500gp-",},
-+      {{BCM47XX_BOARD_ASUS_WL500GPV2, "Asus WL500GPV2"}, "WL500GPV2-",},
++      {{BCM47XX_BOARD_ASUS_WL500GPV1, "Asus WL500GP V1"}, "WL500gp-",},
++      {{BCM47XX_BOARD_ASUS_WL500GPV2, "Asus WL500GP V2"}, "WL500GPV2-",},
 +      {{BCM47XX_BOARD_ASUS_WL520GC, "Asus WL520GC"}, "WL520GC-",},
 +      {{BCM47XX_BOARD_ASUS_WL520GU, "Asus WL520GU"}, "WL520GU-",},
 +      {{BCM47XX_BOARD_BELKIN_F7D4301, "Belkin F7D4301"}, "F7D4301",},
@@ -89,39 +89,39 @@
 +static const struct bcm47xx_board_type_list 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 E100"}, "E100", "1.0"},  /* like WRT160N v3.0 */
-+      {{BCM47XX_BOARD_LINKSYS_E1000V2, "Linksys E1000"}, "E1000", "2.0"},
-+      {{BCM47XX_BOARD_LINKSYS_E2000V1, "Linksys E2000"}, "Linksys E2000", "1.0"},
-+      {{BCM47XX_BOARD_LINKSYS_E3000V1, "Linksys E300"}, "E300", "1.0"}, /* like WRT610N v2.0 */
-+      {{BCM47XX_BOARD_LINKSYS_E3200V1, "Linksys E3200"}, "E3200", "1.0"},
-+      {{BCM47XX_BOARD_LINKSYS_E4200V1, "Linksys E4200"}, "E4200", "1.0"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT150NV11, "Linksys WRT150N"}, "WRT150N", "1.1"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT150NV1, "Linksys WRT150N"}, "WRT150N", "1"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT160NV1, "Linksys WRT160N"}, "WRT160N", "1.0"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT160NV3, "Linksys WRT160N"}, "WRT160N", "3.0"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT300NV11, "Linksys WRT300N"}, "WRT300N", "1.1"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT310NV2, "Linksys WRT310N"}, "WRT310N", "2.0"},
++      {{BCM47XX_BOARD_LINKSYS_E1000V1, "Linksys E1000 V1"}, "E100", "1.0"},  /* like WRT160N v3.0 */
++      {{BCM47XX_BOARD_LINKSYS_E1000V2, "Linksys E1000 V2"}, "E1000", "2.0"},
++      {{BCM47XX_BOARD_LINKSYS_E2000V1, "Linksys E2000 V1"}, "Linksys E2000", "1.0"},
++      {{BCM47XX_BOARD_LINKSYS_E3000V1, "Linksys E3000 V1"}, "E300", "1.0"}, /* like WRT610N v2.0 */
++      {{BCM47XX_BOARD_LINKSYS_E3200V1, "Linksys E3200 V1"}, "E3200", "1.0"},
++      {{BCM47XX_BOARD_LINKSYS_E4200V1, "Linksys E4200 V1"}, "E4200", "1.0"},
++      {{BCM47XX_BOARD_LINKSYS_WRT150NV11, "Linksys WRT150N V1.1"}, "WRT150N", "1.1"},
++      {{BCM47XX_BOARD_LINKSYS_WRT150NV1, "Linksys WRT150N V1"}, "WRT150N", "1"},
++      {{BCM47XX_BOARD_LINKSYS_WRT160NV1, "Linksys WRT160N V1"}, "WRT160N", "1.0"},
++      {{BCM47XX_BOARD_LINKSYS_WRT160NV3, "Linksys WRT160N V3"}, "WRT160N", "3.0"},
++      {{BCM47XX_BOARD_LINKSYS_WRT300NV11, "Linksys WRT300N V1.1"}, "WRT300N", "1.1"},
++      {{BCM47XX_BOARD_LINKSYS_WRT310NV2, "Linksys WRT310N V2"}, "WRT310N", "2.0"},
 +      {{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N"}, "WRT610N", "1.0"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N"}, "WRT610N", "2.0"},
++      {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
++      {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
 +      { {0}, 0},
 +};
 +
 +static const struct bcm47xx_board_type_list bcm47xx_board_list_board_id[] = {
-+      {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614V8"}, "U12H072T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614V9"}, "U12H094T00_NETGEAR",},
++      {{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 WNDR3400V1"}, "U12H155T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR3400VCNA, "Netgear WNDR3400VCNA"}, "U12H155T01_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR3700V3, "Netgear WNDR3700V3"}, "U12H194T00_NETGEAR",},
++      {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_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_WNDR4500, "Netgear WNDR4500"}, "U12H189T00_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 WNR3500V2"}, "U12H127T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNR3500V2VC, "Netgear WNR3500V2VC"}, "U12H127T70_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNR834BV2, "Netgear WNR834BV2"}, "U12H081T00_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},
 +};
 +