X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Far71xx.sh;h=588affd9cd4d10d640e51bf1c4f0dc11e2c49a02;hb=ee53a240ac902dc83209008a2671e7fdcf55957a;hp=ad98cfbae67c98dfaf21beecf88514d76e6181f5;hpb=896d3e3e135e58636fcabcebf48f2eebf77623e4;p=openwrt%2Fstaging%2Fjow.git diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index ad98cfbae6..588affd9cd 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"*) @@ -107,23 +108,42 @@ 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" ;; + "007260"*) + model="TellStick ZNet Lite" + ;; + "066601"*) + model="OMYlink OMY-G1" + ;; + "066602"*) + model="OMYlink OMY-X1" + ;; "3C0001"*) model="OOLITE" ;; - "070300"*) + "3C0002"*) + model="MINIBOX_V1" + ;; + "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" @@ -158,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" @@ -264,7 +288,7 @@ tplink_board_detect() { ;; esac - AR71XX_MODEL="$model $hwver" + AR71XX_MODEL="$model$hwver" } tplink_pharos_get_model_string() { @@ -335,6 +359,9 @@ ar71xx_board_detect() { *"AirRouter") name="airrouter" ;; + *"ALFA Network AP120C") + name="alfa-ap120c" + ;; *"ALFA Network AP96") name="alfa-ap96" ;; @@ -350,10 +377,19 @@ ar71xx_board_detect() { *ALL0315N) name="all0315n" ;; + *Antminer-S1) + name="antminer-s1" + ;; + *Antminer-S3) + name="antminer-s3" + ;; + *"Arduino Yun") + name="arduino-yun" + ;; *AP113) name="ap113" ;; - *AP121) + *"AP121 reference board") name="ap121" ;; *AP121-MINI) @@ -398,6 +434,12 @@ ar71xx_board_detect() { *AW-NR580) name="aw-nr580" ;; + *CAP324) + name="cap324" + ;; + *C-55) + name="c-55" + ;; *CAP4200AG) name="cap4200ag" ;; @@ -408,6 +450,12 @@ ar71xx_board_detect() { name="cpe510" tplink_pharos_board_detect ;; + *CR3000) + name="cr3000" + ;; + *CR5000) + name="cr5000" + ;; *"DB120 reference board") name="db120" ;; @@ -441,15 +489,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" ;; @@ -466,6 +523,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" ;; @@ -514,12 +577,18 @@ 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" ;; @@ -553,6 +622,9 @@ ar71xx_board_detect() { *"NBG460N/550N/550NH") name="nbg460n_550n_550nh" ;; + *"Zyxel NBG6616") + name="nbg6616" + ;; *"Zyxel NBG6716") name="nbg6716" ;; @@ -577,6 +649,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" ;; @@ -697,6 +781,9 @@ ar71xx_board_detect() { "Smart Electronics Black Swift board"*) name="bsb" ;; + *"Telldus TellStick ZNet Lite") + name="tellstick-znet-lite" + ;; *TEW-632BRP) name="tew-632brp" ;; @@ -709,6 +796,9 @@ ar71xx_board_detect() { *TEW-732BR) name="tew-732br" ;; + *TEW-823DRU) + name="tew-823dru" + ;; *"TL-WR1041N v2") name="tl-wr1041n-v2" ;; @@ -769,6 +859,9 @@ ar71xx_board_detect() { *"TL-WA801ND v2") name="tl-wa801nd-v2" ;; + *"TL-WA801ND v3") + name="tl-wa801nd-v3" + ;; *TL-WA901ND) name="tl-wa901nd" ;; @@ -778,6 +871,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" ;; @@ -820,6 +916,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" ;; @@ -847,10 +946,13 @@ ar71xx_board_detect() { *UniFi) name="unifi" ;; + *"UniFi-AC") + name="unifiac" + ;; *"UniFi AP Pro") name="uap-pro" ;; - *"WeIO") + "WeIO"*) name="weio" ;; *WHR-G301N) @@ -874,6 +976,9 @@ ar71xx_board_detect() { *WPE72) name="wpe72" ;; + *WPJ342) + name="wpj342" + ;; *WPJ344) name="wpj344" ;; @@ -916,6 +1021,9 @@ ar71xx_board_detect() { *"WNR1000 V2") name="wnr1000-v2" ;; + *WPN824N) + name="wpn824n" + ;; *WRT160NL) name="wrt160nl" ;;