X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Far71xx.sh;h=56b59474b18e8e56449d2a731bfa1e337d5dc79e;hb=96fa9aa13bfa4efba70e6effab22438961c1127b;hp=df77040bdd8fac3494543b3f9bf72e1e577e6a02;hpb=1a092ce0e09a4175bb58f8b2dad3615edc7df0ba;p=openwrt%2Fopenwrt.git diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index df77040bdd..56b59474b1 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -39,7 +39,7 @@ wndr3700_board_detect() { "33373031") model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c)" # Use awk to remove everything unprintable - model_stripped="$(echo -n "$model" | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')" + 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 @@ -99,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"*) @@ -114,9 +114,21 @@ 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" ;; @@ -128,6 +140,10 @@ tplink_board_detect() { ;; "071000"*) model="TP-Link TL-WR710N" + + if [ "$hwid" = '07100002' -a "$mid" = '00000002' ]; then + hwver=' v2.1' + fi ;; "072001"*) model="TP-Link TL-WR720N" @@ -162,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" @@ -268,7 +288,7 @@ tplink_board_detect() { ;; esac - AR71XX_MODEL="$model $hwver" + AR71XX_MODEL="$model$hwver" } tplink_pharos_get_model_string() { @@ -339,6 +359,9 @@ ar71xx_board_detect() { *"AirRouter") name="airrouter" ;; + *"ALFA Network AP120C") + name="alfa-ap120c" + ;; *"ALFA Network AP96") name="alfa-ap96" ;; @@ -366,7 +389,7 @@ ar71xx_board_detect() { *AP113) name="ap113" ;; - *AP121) + *"AP121 reference board") name="ap121" ;; *AP121-MINI) @@ -411,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" ;; @@ -463,6 +502,12 @@ ar71xx_board_detect() { *"dLAN pro 1200+ WiFi ac") name="dlan-pro-1200-ac" ;; + *DR344) + name="dr344" + ;; + *DR531) + name="dr531" + ;; *"Dragino v2") name="dragino2" ;; @@ -491,6 +536,12 @@ ar71xx_board_detect() { *"GL AR300") name="gl-ar300" ;; + *"GL-AR300M") + name="gl-ar300m" + ;; + *"GL-MIFI") + name="gl-mifi" + ;; *"EnGenius EPG5000") name="epg5000" ;; @@ -521,6 +572,9 @@ ar71xx_board_detect() { *JWAP003) name="jwap003" ;; + *JWAP230) + name="jwap230" + ;; *"Hornet-UB") local size size=$(awk '/firmware/ { print $2 }' /proc/mtd) @@ -548,12 +602,18 @@ ar71xx_board_detect() { *MR16) name="mr16" ;; + *MR18) + name="mr18" + ;; *MR600v2) name="mr600v2" ;; *MR1750) name="mr1750" ;; + *MR1750v2) + name="mr1750v2" + ;; *MR600) name="mr600" ;; @@ -599,6 +659,9 @@ ar71xx_board_detect() { *"OM2P HSv2") name="om2p-hsv2" ;; + *"OM2P HSv3") + name="om2p-hsv3" + ;; *"OM2P LC") name="om2p-lc" ;; @@ -608,6 +671,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" ;; @@ -728,6 +803,12 @@ ar71xx_board_detect() { "Smart Electronics Black Swift board"*) name="bsb" ;; + *"Telldus TellStick ZNet Lite") + name="tellstick-znet-lite" + ;; + *SOM9331) + name="som9331" + ;; *TEW-632BRP) name="tew-632brp" ;; @@ -740,6 +821,9 @@ ar71xx_board_detect() { *TEW-732BR) name="tew-732br" ;; + *TEW-823DRU) + name="tew-823dru" + ;; *"TL-WR1041N v2") name="tl-wr1041n-v2" ;; @@ -800,6 +884,9 @@ ar71xx_board_detect() { *"TL-WA801ND v2") name="tl-wa801nd-v2" ;; + *"TL-WA801ND v3") + name="tl-wa801nd-v3" + ;; *TL-WA901ND) name="tl-wa901nd" ;; @@ -809,6 +896,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" ;; @@ -842,9 +932,15 @@ 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" ;; @@ -863,6 +959,9 @@ ar71xx_board_detect() { *"TL-WR720N"*) name="tl-wr720n-v3" ;; + *"TL-WR810N") + name="tl-wr810n" + ;; *"TL-MR10U") name="tl-mr10u" ;; @@ -881,6 +980,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" ;; @@ -908,6 +1013,9 @@ ar71xx_board_detect() { *WPE72) name="wpe72" ;; + *WPJ342) + name="wpj342" + ;; *WPJ344) name="wpj344" ;; @@ -950,12 +1058,18 @@ ar71xx_board_detect() { *"WNR1000 V2") name="wnr1000-v2" ;; + *WPN824N) + name="wpn824n" + ;; *WRT160NL) name="wrt160nl" ;; *WRT400N) name="wrt400n" ;; + *"WRTnode2Q board") + name="wrtnode2q" + ;; *"WZR-450HP2") name="wzr-450hp2" ;;