X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Far71xx.sh;h=c2ad7690a3059a337b8b4adc112d31a0b2ba1e17;hb=d2a91f9853a9bfb47cb5d6e3078372f3f85557c5;hp=5f02e4e1ca260c7f8aa5c13219c067ad649adc8b;hpb=8d8a937272fd03902d4e40888efcf3ff707c0d57;p=openwrt%2Fstaging%2Flynxis%2Fomap.git diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 5f02e4e1ca..c2ad7690a3 100755 --- 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 @@ -98,7 +99,7 @@ tplink_board_detect() { hwid=$(tplink_get_hwid) mid=$(tplink_get_mid) hwver=${hwid:6:2} - hwver="v${hwver#0}" + hwver=" v${hwver#0}" case "$hwid" in "015000"*) @@ -113,20 +114,36 @@ tplink_board_detect() { "044403"*) model="ANTMINER-S3" ;; + "44440101"*) + model="ANTROUTER-R1" + ;; "120000"*) model="MERCURY MAC1200R" ;; + "007260"*) + model="TellStick ZNet Lite" + ;; + "066601"*) + model="OMYlink OMY-G1" + ;; + "066602"*) + model="OMYlink OMY-X1" + ;; "3C0001"*) model="OOLITE" ;; "3C0002"*) model="MINIBOX_V1" ;; - "070300"*) + "070301"*) model="TP-Link TL-WR703N" ;; "071000"*) model="TP-Link TL-WR710N" + + if [ "$hwid" = '07100002' -a "$mid" = '00000002' ]; then + hwver=' v2.1' + fi ;; "072001"*) model="TP-Link TL-WR720N" @@ -161,12 +178,16 @@ tplink_board_detect() { "083000"*) model="TP-Link TL-WA830RE" - if [ "$hwver" = 'v10' ]; then - hwver='v1' + if [ "$hwver" = ' v10' ]; then + hwver=' v1' fi ;; "084100"*) model="TP-Link TL-WR841N/ND" + + if [ "$hwid" = '08410002' -a "$mid" = '00000002' ]; then + hwver=' v1.5' + fi ;; "084200"*) model="TP-Link TL-WR842N/ND" @@ -267,7 +288,7 @@ tplink_board_detect() { ;; esac - AR71XX_MODEL="$model $hwver" + AR71XX_MODEL="$model$hwver" } tplink_pharos_get_model_string() { @@ -338,6 +359,9 @@ ar71xx_board_detect() { *"AirRouter") name="airrouter" ;; + *"ALFA Network AP120C") + name="alfa-ap120c" + ;; *"ALFA Network AP96") name="alfa-ap96" ;; @@ -359,10 +383,13 @@ ar71xx_board_detect() { *Antminer-S3) name="antminer-s3" ;; + *"Arduino Yun") + name="arduino-yun" + ;; *AP113) name="ap113" ;; - *AP121) + *"AP121 reference board") name="ap121" ;; *AP121-MINI) @@ -407,16 +434,32 @@ ar71xx_board_detect() { *AW-NR580) name="aw-nr580" ;; + *CAP324) + name="cap324" + ;; + *C-55) + name="c-55" + ;; *CAP4200AG) name="cap4200ag" ;; *"COMFAST CF-E316N v2") name="cf-e316n-v2" ;; - *"CPE210/220/510/520") + *"CPE210/220") + name="cpe210" + tplink_pharos_board_detect + ;; + *"CPE510/520") name="cpe510" tplink_pharos_board_detect ;; + *CR3000) + name="cr3000" + ;; + *CR5000) + name="cr5000" + ;; *"DB120 reference board") name="db120" ;; @@ -450,15 +493,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" ;; @@ -475,6 +527,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" ;; @@ -532,12 +590,18 @@ ar71xx_board_detect() { *MR16) name="mr16" ;; + *MR18) + name="mr18" + ;; *MR600v2) name="mr600v2" ;; *MR1750) name="mr1750" ;; + *MR1750v2) + name="mr1750v2" + ;; *MR600) name="mr600" ;; @@ -565,6 +629,9 @@ ar71xx_board_detect() { *"NBG460N/550N/550NH") name="nbg460n_550n_550nh" ;; + *"Zyxel NBG6616") + name="nbg6616" + ;; *"Zyxel NBG6716") name="nbg6716" ;; @@ -580,6 +647,9 @@ ar71xx_board_detect() { *"OM2P HSv2") name="om2p-hsv2" ;; + *"OM2P HSv3") + name="om2p-hsv3" + ;; *"OM2P LC") name="om2p-lc" ;; @@ -589,6 +659,18 @@ ar71xx_board_detect() { *"OM5P AN") name="om5p-an" ;; + *"OM5P AC") + name="om5p-ac" + ;; + *"OM5P ACv2") + name="om5p-acv2" + ;; + *"OMY-X1") + name="omy-x1" + ;; + *"OMY-G1") + name="omy-g1" + ;; *"Onion Omega") name="onion-omega" ;; @@ -709,6 +791,9 @@ ar71xx_board_detect() { "Smart Electronics Black Swift board"*) name="bsb" ;; + *"Telldus TellStick ZNet Lite") + name="tellstick-znet-lite" + ;; *TEW-632BRP) name="tew-632brp" ;; @@ -721,6 +806,9 @@ ar71xx_board_detect() { *TEW-732BR) name="tew-732br" ;; + *TEW-823DRU) + name="tew-823dru" + ;; *"TL-WR1041N v2") name="tl-wr1041n-v2" ;; @@ -781,6 +869,9 @@ ar71xx_board_detect() { *"TL-WA801ND v2") name="tl-wa801nd-v2" ;; + *"TL-WA801ND v3") + name="tl-wa801nd-v3" + ;; *TL-WA901ND) name="tl-wa901nd" ;; @@ -790,6 +881,9 @@ ar71xx_board_detect() { *"TL-WA901ND v3") name="tl-wa901nd-v3" ;; + *"TL-WA901ND v4") + name="tl-wa901nd-v4" + ;; *"TL-WDR3320 v2") name="tl-wdr3320-v2" ;; @@ -823,15 +917,24 @@ ar71xx_board_detect() { *"TL-WR841N/ND v9") name="tl-wr841n-v9" ;; + *"TL-WR841N/ND v11") + name="tl-wr841n-v11" + ;; *"TL-WR842N/ND v2") name="tl-wr842n-v2" ;; + *"TL-WR842N/ND v3") + name="tl-wr842n-v3" + ;; *TL-WR941ND) name="tl-wr941nd" ;; *"TL-WR941N/ND v5") name="tl-wr941nd-v5" ;; + *"TL-WR941N/ND v6") + name="tl-wr941nd-v6" + ;; *"TL-WR703N v1") name="tl-wr703n" ;; @@ -841,6 +944,9 @@ ar71xx_board_detect() { *"TL-WR720N"*) name="tl-wr720n-v3" ;; + *"TL-WR810N") + name="tl-wr810n" + ;; *"TL-MR10U") name="tl-mr10u" ;; @@ -859,6 +965,12 @@ ar71xx_board_detect() { *UniFi) name="unifi" ;; + *"UniFi-AC-LITE") + name="unifiac-lite" + ;; + *"UniFi-AC-PRO") + name="unifiac-pro" + ;; *"UniFi AP Pro") name="uap-pro" ;; @@ -886,6 +998,9 @@ ar71xx_board_detect() { *WPE72) name="wpe72" ;; + *WPJ342) + name="wpj342" + ;; *WPJ344) name="wpj344" ;; @@ -928,6 +1043,9 @@ ar71xx_board_detect() { *"WNR1000 V2") name="wnr1000-v2" ;; + *WPN824N) + name="wpn824n" + ;; *WRT160NL) name="wrt160nl" ;;