ar71xx: add support for Compex WPJ342

[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 61dcbbadd284df072beb21dbc61cc79e0fe4d2b8..b3eda6c469b5b5b93b86286b5af7f91127610ebb 100755 (executable)
--- 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"*)
@@ -120,6 +120,12 @@ tplink_board_detect() {
        "120000"*)
                model="MERCURY MAC1200R"
                ;;
+       "007260"*)
+               model="TellStick ZNet Lite"
+               ;;
+       "066602"*)
+               model="OMYlink OMY-X1"
+               ;;
        "3C0001"*)
                model="OOLITE"
                ;;
@@ -131,6 +137,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"
@@ -165,12 +175,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"
@@ -271,7 +285,7 @@ tplink_board_detect() {
                ;;
        esac
 
-       AR71XX_MODEL="$model $hwver"
+       AR71XX_MODEL="$model$hwver"
 }
 
 tplink_pharos_get_model_string() {
@@ -342,6 +356,9 @@ ar71xx_board_detect() {
        *"AirRouter")
                name="airrouter"
                ;;
+       *"ALFA Network AP120C")
+               name="alfa-ap120c"
+               ;;
        *"ALFA Network AP96")
                name="alfa-ap96"
                ;;
@@ -369,7 +386,7 @@ ar71xx_board_detect() {
        *AP113)
                name="ap113"
                ;;
-       *AP121)
+       *"AP121 reference board")
                name="ap121"
                ;;
        *AP121-MINI)
@@ -629,6 +646,15 @@ ar71xx_board_detect() {
        *"OM5P AN")
                name="om5p-an"
                ;;
+       *"OM5P AC")
+               name="om5p-ac"
+               ;;
+       *"OM5P ACv2")
+               name="om5p-acv2"
+               ;;
+       *"OMY-X1")
+               name="omy-x1"
+               ;;
        *"Onion Omega")
                name="onion-omega"
                ;;
@@ -749,6 +775,9 @@ ar71xx_board_detect() {
        "Smart Electronics Black Swift board"*)
                name="bsb"
                ;;
+       *"Telldus TellStick ZNet Lite")
+               name="tellstick-znet-lite"
+               ;;
        *TEW-632BRP)
                name="tew-632brp"
                ;;
@@ -824,6 +853,9 @@ ar71xx_board_detect() {
        *"TL-WA801ND v2")
                name="tl-wa801nd-v2"
                ;;
+       *"TL-WA801ND v3")
+               name="tl-wa801nd-v3"
+               ;;
        *TL-WA901ND)
                name="tl-wa901nd"
                ;;
@@ -905,6 +937,9 @@ ar71xx_board_detect() {
        *UniFi)
                name="unifi"
                ;;
+       *"UniFi-AC")
+               name="unifiac"
+               ;;
        *"UniFi AP Pro")
                name="uap-pro"
                ;;
@@ -932,6 +967,9 @@ ar71xx_board_detect() {
        *WPE72)
                name="wpe72"
                ;;
+       *WPJ342)
+               name="wpj342"
+               ;;
        *WPJ344)
                name="wpj344"
                ;;
@@ -974,6 +1012,9 @@ ar71xx_board_detect() {
        *"WNR1000 V2")
                name="wnr1000-v2"
                ;;
+       *WPN824N)
+               name="wpn824n"
+               ;;
        *WRT160NL)
                name="wrt160nl"
                ;;