ar71xx: fix RB941-2nD detection

[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 ce9225ec941e04a5d4641c1271805d5dc72720b9..95fa247f4bef053074be279879a04ca8728d6065 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -98,22 +98,28 @@ ubnt_xm_board_detect() {
        [ -z "$model" ] || AR71XX_MODEL="${model}${magic:3:1}"
 }
 
-ubnt_ac_lite_get_mtd_part_magic() {
+ubnt_unifi_ac_get_mtd_part_magic() {
        ar71xx_get_mtd_offset_size_format EEPROM 12 2 %02x
 }
 
-ubnt_ac_lite_board_detect() {
+ubnt_unifi_ac_board_detect() {
        local model
        local magic
 
-       magic="$(ubnt_ac_lite_get_mtd_part_magic)"
+       magic="$(ubnt_unifi_ac_get_mtd_part_magic)"
        case ${magic:0:4} in
        "e517")
                model="Ubiquiti UniFi-AC-LITE"
                ;;
+       "e537")
+               model="Ubiquiti UniFi-AC-PRO"
+               ;;
        "e557")
                model="Ubiquiti UniFi-AC-MESH"
                ;;
+       "e567")
+               model="Ubiquiti UniFi-AC-MESH-PRO"
+               ;;
        esac
 
        [ -z "$model" ] || AR71XX_MODEL="${model}"
@@ -371,7 +377,7 @@ tplink_pharos_get_model_string() {
 }
 
 tplink_pharos_board_detect() {
-       local model_string="$(tplink_pharos_get_model_string | tr -d '\r')"
+       local model_string="$1"
        local oIFS="$IFS"; IFS=":"; set -- $model_string; IFS="$oIFS"
 
        local model="${1%%\(*}"
@@ -379,6 +385,14 @@ tplink_pharos_board_detect() {
        AR71XX_MODEL="TP-Link $model v$2"
 }
 
+tplink_pharos_v2_get_model_string() {
+       local part
+       part=$(find_mtd_part 'product-info')
+       [ -z "$part" ] && return 1
+
+       dd if=$part bs=1 skip=4360 count=64 2>/dev/null | tr -d '\r\0' | head -n 1
+}
+
 ar71xx_board_detect() {
        local machine
        local name
@@ -476,11 +490,17 @@ ar71xx_board_detect() {
        *"Archer C7 v4")
                name="archer-c7-v4"
                ;;
+       *"Archer C7 v5")
+               name="archer-c7-v5"
+               ;;
        *"Archer C58 v1")
                name="archer-c58-v1"
                ;;
        *"Archer C59 v1")
                name="archer-c59-v1"
+        ;;
+       *"Archer C59 v2")
+               name="archer-c59-v2"
                ;;
        *"Archer C60 v1")
                name="archer-c60-v1"
@@ -560,14 +580,25 @@ ar71xx_board_detect() {
                ;;
        *"CPE210/220")
                name="cpe210"
-               tplink_pharos_board_detect
+               tplink_pharos_board_detect "$(tplink_pharos_get_model_string | tr -d '\r')"
+               ;;
+       *"CPE210 v2")
+               name="cpe210-v2"
+               tplink_pharos_board_detect "$(tplink_pharos_v2_get_model_string)"
                ;;
        *"CPE505N")
                name="cpe505n"
                ;;
        *"CPE510/520")
                name="cpe510"
-               tplink_pharos_board_detect
+               tplink_pharos_board_detect "$(tplink_pharos_v2_get_model_string)"
+               case $AR71XX_MODEL in
+               'TP-Link CPE510 v2.0')
+                       ;;
+               *)
+                       tplink_pharos_board_detect "$(tplink_pharos_get_model_string | tr -d '\r')"
+                       ;;
+               esac
                ;;
        *"CPE830")
                name="cpe830"
@@ -660,15 +691,24 @@ ar71xx_board_detect() {
        *"E2100L")
                name="e2100l"
                ;;
+       *"E558 v2")
+               name="e558-v2"
+               ;;
        *"E600G v2")
                name="e600g-v2"
                ;;
        *"E600GAC v2")
                name="e600gac-v2"
                ;;
+       *"E750A v4")
+               name="e750a-v4"
+               ;;
+       *"E750G v8")
+               name="e750g-v8"
+               ;;
        *"EAP120")
                name="eap120"
-               tplink_pharos_board_detect
+               tplink_pharos_board_detect "$(tplink_pharos_get_model_string | tr -d '\r')"
                ;;
        *"EAP300 v2")
                name="eap300v2"
@@ -715,6 +755,9 @@ ar71xx_board_detect() {
        *"FRITZ!WLAN Repeater 300E")
                name="fritz300e"
                ;;
+       *"FRITZ!WLAN Repeater 450E")
+               name="fritz450e"
+               ;;
        *"GL-AR150")
                name="gl-ar150"
                ;;
@@ -792,6 +835,9 @@ ar71xx_board_detect() {
        *"MiniBox V1.0")
                name="minibox-v1"
                ;;
+       *"Minibox V3.2")
+               name="minibox-v3.2"
+               ;;
        *"MR12")
                name="mr12"
                ;;
@@ -1043,7 +1089,10 @@ ar71xx_board_detect() {
        *"RouterBOARD 921GS-5HPacD r2")
                name="rb-921gs-5hpacd-r2"
                ;;
-       *"RouterBOARD 941-2nD")
+       *"RouterBOARD 931-2nD")
+               name="rb-931-2nd"
+               ;;
+       *"RouterBOARD"*"941-2nD")
                name="rb-941-2nd"
                ;;
        *"RouterBOARD 951G-2HnD")
@@ -1079,6 +1128,9 @@ ar71xx_board_detect() {
        *"RouterBOARD wAP 2nD r2")
                name="rb-wap-2nd"
                ;;
+       *"RouterBOARD wAP R-2nD")
+               name="rb-wapr-2nd"
+               ;;
        *"RouterBOARD wAP G-5HacT2HnD")
                name="rb-wapg-5hact2hnd"
                ;;
@@ -1345,10 +1397,11 @@ ar71xx_board_detect() {
                ;;
        *"UniFi-AC-LITE/MESH")
                name="unifiac-lite"
-               ubnt_ac_lite_board_detect
+               ubnt_unifi_ac_board_detect
                ;;
-       *"UniFi-AC-PRO")
+       *"UniFi-AC-PRO/MESH-PRO")
                name="unifiac-pro"
+               ubnt_unifi_ac_board_detect
                ;;
        *"UniFiAP Outdoor")
                name="unifi-outdoor"
@@ -1361,11 +1414,11 @@ ar71xx_board_detect() {
                ;;
        *"WBS210")
                name="wbs210"
-               tplink_pharos_board_detect
+               tplink_pharos_board_detect "$(tplink_pharos_get_model_string | tr -d '\r')"
                ;;
        *"WBS510")
                name="wbs510"
-               tplink_pharos_board_detect
+               tplink_pharos_board_detect "$(tplink_pharos_get_model_string | tr -d '\r')"
                ;;
        "WeIO"*)
                name="weio"