ar71xx: another fix to wndr3700_board_detect

[openwrt/openwrt.git] / target / linux / ar71xx / base-files / lib / ar71xx.sh

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index d4959408de0d9b3515a383fdaa986de1dead728f..678482eb156b77a7ea0a7aa5d8d3c698760da53b 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -37,8 +37,9 @@ wndr3700_board_detect() {
                machine="NETGEAR WNDR3700"
                ;;
        "33373031")
-               # Use awk to remove everything after the first zero byte
-               model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
+               model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c)"
+               # Use awk to remove everything unprintable
+               model_stripped="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
                case $model in
                $'\xff'*)
                        if [ "${model:24:1}" = 'N' ]; then
@@ -48,14 +49,14 @@ wndr3700_board_detect() {
                        fi
                        ;;
                '29763654+16+64'*)
-                       machine="NETGEAR ${model:14}"
+                       machine="NETGEAR ${model_stripped:14}"
                        ;;
                '29763654+16+128'*)
-                       machine="NETGEAR ${model:15}"
+                       machine="NETGEAR ${model_stripped:15}"
                        ;;
                *)
                        # Unknown ID
-                       machine="NETGEAR $model"
+                       machine="NETGEAR ${model_stripped}"
                esac
        esac
 
@@ -107,11 +108,14 @@ tplink_board_detect() {
        "015300"*)
                model="EasyLink EL-MINI"
                ;;
-       "04440001"*)
-               model="BITMAIN ANTMINER S1"
+       "044401"*)
+               model="ANTMINER-S1"
                ;;
-       "04440003"*)
-               model="BITMAIN ANTMINER S3"
+       "044403"*)
+               model="ANTMINER-S3"
+               ;;
+       "44440101"*)
+               model="ANTROUTER-R1"
                ;;
        "120000"*)
                model="MERCURY MAC1200R"
@@ -119,7 +123,10 @@ tplink_board_detect() {
        "3C0001"*)
                model="OOLITE"
                ;;
-       "070300"*)
+       "3C0002"*)
+               model="MINIBOX_V1"
+               ;;
+       "070301"*)
                model="TP-Link TL-WR703N"
                ;;
        "071000"*)
@@ -221,6 +228,9 @@ tplink_board_detect() {
        "342000"*)
                model="TP-Link TL-MR3420"
                ;;
+       "332000"*)
+               model="TP-Link TL-WDR3320"
+               ;;
        "350000"*)
                model="TP-Link TL-WDR3500"
                ;;
@@ -326,6 +336,9 @@ ar71xx_board_detect() {
        *"AirGateway")
                name="airgateway"
                ;;
+       *"AirGateway Pro")
+               name="airgatewaypro"
+               ;;
        *"AirRouter")
                name="airrouter"
                ;;
@@ -344,6 +357,15 @@ ar71xx_board_detect() {
        *ALL0315N)
                name="all0315n"
                ;;
+       *Antminer-S1)
+               name="antminer-s1"
+               ;;
+       *Antminer-S3)
+               name="antminer-s3"
+               ;;
+       *"Arduino Yun")
+               name="arduino-yun"
+               ;;
        *AP113)
                name="ap113"
                ;;
@@ -371,6 +393,9 @@ ar71xx_board_detect() {
        *"AP147-010 reference board")
                name="ap147-010"
                ;;
+       *"AP152 reference board")
+               name="ap152"
+               ;;
        *AP81)
                name="ap81"
                ;;
@@ -389,6 +414,12 @@ ar71xx_board_detect() {
        *AW-NR580)
                name="aw-nr580"
                ;;
+       *CAP324)
+               name="cap324"
+               ;;
+       *C-55)
+               name="c-55"
+               ;;
        *CAP4200AG)
                name="cap4200ag"
                ;;
@@ -399,6 +430,12 @@ ar71xx_board_detect() {
                name="cpe510"
                tplink_pharos_board_detect
                ;;
+       *CR3000)
+               name="cr3000"
+               ;;
+       *CR5000)
+               name="cr5000"
+               ;;
        *"DB120 reference board")
                name="db120"
                ;;
@@ -432,15 +469,24 @@ ar71xx_board_detect() {
        *"DIR-835 rev. A1")
                name="dir-835-a1"
                ;;
+       *"dLAN Hotspot")
+               name="dlan-hotspot"
+               ;;
        *"dLAN pro 500 Wireless+")
                name="dlan-pro-500-wp"
                ;;
        *"dLAN pro 1200+ WiFi ac")
                name="dlan-pro-1200-ac"
                ;;
+       *DR344)
+               name="dr344"
+               ;;
        *"Dragino v2")
                name="dragino2"
                ;;
+       *"Domino Pi")
+               name="gl-domino"
+               ;;
        *"EAP300 v2")
                name="eap300v2"
                ;;
@@ -457,6 +503,12 @@ ar71xx_board_detect() {
                name="gl-inet"
                gl_inet_board_detect
                ;;
+       *"GL AR150")
+               name="gl-ar150"
+               ;;
+       *"GL AR300")
+               name="gl-ar300"
+               ;;
        *"EnGenius EPG5000")
                name="epg5000"
                ;;
@@ -505,15 +557,24 @@ ar71xx_board_detect() {
        *"MAC1200R")
                name="mc-mac1200r"
                ;;
+       *"MiniBox V1.0")
+               name="minibox-v1"
+               ;;
        *MR12)
                name="mr12"
                ;;
        *MR16)
                name="mr16"
                ;;
+       *MR18)
+               name="mr18"
+               ;;
        *MR600v2)
                name="mr600v2"
                ;;
+       *MR1750)
+               name="mr1750"
+               ;;
        *MR600)
                name="mr600"
                ;;
@@ -541,6 +602,9 @@ ar71xx_board_detect() {
        *"NBG460N/550N/550NH")
                name="nbg460n_550n_550nh"
                ;;
+       *"Zyxel NBG6616")
+               name="nbg6616"
+               ;;
        *"Zyxel NBG6716")
                name="nbg6716"
                ;;
@@ -697,6 +761,9 @@ ar71xx_board_detect() {
        *TEW-732BR)
                name="tew-732br"
                ;;
+       *TEW-823DRU)
+               name="tew-823dru"
+               ;;
        *"TL-WR1041N v2")
                name="tl-wr1041n-v2"
                ;;
@@ -766,6 +833,9 @@ ar71xx_board_detect() {
        *"TL-WA901ND v3")
                name="tl-wa901nd-v3"
                ;;
+       *"TL-WDR3320 v2")
+               name="tl-wdr3320-v2"
+               ;;
        *"TL-WDR3500")
                name="tl-wdr3500"
                ;;
@@ -805,6 +875,9 @@ ar71xx_board_detect() {
        *"TL-WR941N/ND v5")
                name="tl-wr941nd-v5"
                ;;
+       *"TL-WR941N/ND v6")
+               name="tl-wr941nd-v6"
+               ;;
        *"TL-WR703N v1")
                name="tl-wr703n"
                ;;
@@ -835,6 +908,9 @@ ar71xx_board_detect() {
        *"UniFi AP Pro")
                name="uap-pro"
                ;;
+       "WeIO"*)
+               name="weio"
+               ;;
        *WHR-G301N)
                name="whr-g301n"
                ;;