X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Far71xx.sh;h=ae0189d05b4dbb73f79d5c338a34f9db494595f7;hp=75542470babcf7f142912964cb2f4d600ed48389;hb=f9278337cf4b9c699a41dfc1e4c448213be53e61;hpb=1b2b3cb8becef2bf6ddf3f3f3747f99fa17e334d

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 75542470ba..ae0189d05b 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -76,17 +76,18 @@ ubnt_xm_board_detect() {
 	case ${magic:0:3} in
 		"e00"|\
 		"e01"|\
-		"e80")  # Different revisions of the NanoStation?
+		"e80")
 			model="Ubiquiti NanoStation M"
 			;;
 		"e0a")
 			model="Ubiquiti NanoStation loco M"
 			;;
-		"e1b")  # Rocket M5 untested
+		"e1b"|\
+		"e1d")
 			model="Ubiquiti Rocket M"
 			;;
 		"e20"|\
-		"e2d")  # Bullet M Ti
+		"e2d")
 			model="Ubiquiti Bullet M"
 			;;
 		"e30")
@@ -219,6 +220,10 @@ tplink_board_detect() {
 		;;
 	"080200"*)
 		model="TP-Link TL-WR802N"
+
+		if [ "$hwid" = '08020002' -a "$mid" = '00000002' ]; then
+			hwver=' v2'
+		fi
 		;;
 	"083000"*)
 		model="TP-Link TL-WA830RE"
@@ -249,6 +254,9 @@ tplink_board_detect() {
 	"090100"*)
 		model="TP-Link TL-WA901N/ND"
 		;;
+	"094000"*)
+		model="TP-Link TL-WR940N"
+		;;
 	"094100"*)
 		if [ "$hwid" = "09410002" -a "$mid" = "00420001" ]; then
 			model="Rosewill RNX-N360RT"
@@ -349,27 +357,10 @@ tplink_pharos_get_model_string() {
 tplink_pharos_board_detect() {
 	local model_string="$(tplink_pharos_get_model_string | tr -d '\r')"
 	local oIFS="$IFS"; IFS=":"; set -- $model_string; IFS="$oIFS"
-	local model
 
-	case "$1" in
-	'CPE210(TP-LINK|UN|N300-2)')
-		model='TP-Link CPE210'
-		;;
-	'CPE220(TP-LINK|UN|N300-2)')
-		model='TP-Link CPE220'
-		;;
-	'CPE510(TP-LINK|UN|N300-5)')
-		model='TP-Link CPE510'
-		;;
-	'CPE520(TP-LINK|UN|N300-5)')
-		model='TP-Link CPE520'
-		;;
-	'EAP120(TP-LINK|UN|N300-2)')
-		model='TP-Link EAP120'
-		;;
-	esac
+	local model="${1%%\(*}"
 
-	[ -n "$model" ] && AR71XX_MODEL="$model v$2"
+	AR71XX_MODEL="TP-Link $model v$2"
 }
 
 gl_inet_board_detect() {
@@ -395,6 +386,12 @@ ar71xx_board_detect() {
 	*"Oolite V1.0")
 		name="oolite"
 		;;
+	*"A40")
+		name="a40"
+		;;
+	*"A60")
+		name="a60"
+		;;
 	*"AC1750DB")
 		name="f9k1115v2"
 		;;
@@ -434,9 +431,6 @@ ar71xx_board_detect() {
 	*"Arduino Yun")
 		name="arduino-yun"
 		;;
-	*AP113)
-		name="ap113"
-		;;
 	*"AP121 reference board")
 		name="ap121"
 		;;
@@ -464,15 +458,18 @@ ar71xx_board_detect() {
 	*"AP152 reference board")
 		name="ap152"
 		;;
-	*AP81)
-		name="ap81"
-		;;
-	*AP83)
-		name="ap83"
+	*AP90Q)
+		name="ap90q"
 		;;
 	*"Archer C5")
 		name="archer-c5"
 		;;
+	*"Archer C59 v1")
+		name="archer-c59-v1"
+		;;
+	*"Archer C60 v1")
+		name="archer-c60-v1"
+		;;
 	*"Archer C7")
 		name="archer-c7"
 		;;
@@ -482,6 +479,9 @@ ar71xx_board_detect() {
 	*AW-NR580)
 		name="aw-nr580"
 		;;
+	*BHR-4GRV2)
+		name="bhr-4grv2"
+		;;
 	*CAP324)
 		name="cap324"
 		;;
@@ -494,9 +494,24 @@ ar71xx_board_detect() {
 	*CAP4200AG)
 		name="cap4200ag"
 		;;
-	*"COMFAST CF-E316N v2")
+	*"CF-E316N v2")
 		name="cf-e316n-v2"
 		;;
+	*"CF-E320N v2")
+		name="cf-e320n-v2"
+		;;
+	*"CF-E380AC v1")
+		name="cf-e380ac-v1"
+		;;
+	*"CF-E380AC v2")
+		name="cf-e380ac-v2"
+		;;
+	*CF-E520N)
+		name="cf-e520n"
+		;;
+	*CF-E530N)
+		name="cf-e530n"
+		;;
 	*"CPE210/220")
 		name="cpe210"
 		tplink_pharos_board_detect
@@ -505,6 +520,20 @@ ar71xx_board_detect() {
 		name="cpe510"
 		tplink_pharos_board_detect
 		;;
+	*CPE830)
+		name="cpe830"
+		;;
+	*CPE870)
+		name="cpe870"
+		;;
+	*WBS210)
+		name="wbs210"
+		tplink_pharos_board_detect
+		;;
+	*WBS510)
+		name="wbs510"
+		tplink_pharos_board_detect
+		;;
 	*CR3000)
 		name="cr3000"
 		;;
@@ -575,6 +604,9 @@ ar71xx_board_detect() {
 	*"DW33D")
 		name="dw33d"
 		;;
+	*E2100L)
+		name="e2100l"
+		;;
 	*"EAP120")
 		name="eap120"
 		tplink_pharos_board_detect
@@ -585,6 +617,9 @@ ar71xx_board_detect() {
 	*EAP7660D)
 		name="eap7660d"
 		;;
+	*"EBR-2310 rev. C1")
+		name="ebr-2310-c1"
+		;;
 	*EL-M150)
 		name="el-m150"
 		;;
@@ -720,6 +755,9 @@ ar71xx_board_detect() {
 	*OM2Pv2)
 		name="om2pv2"
 		;;
+	*OM2Pv4)
+		name="om2pv4"
+		;;
 	*"OM2P HS")
 		name="om2p-hs"
 		;;
@@ -729,6 +767,9 @@ ar71xx_board_detect() {
 	*"OM2P HSv3")
 		name="om2p-hsv3"
 		;;
+	*"OM2P HSv4")
+		name="om2p-hsv4"
+		;;
 	*"OM2P LC")
 		name="om2p-lc"
 		;;
@@ -759,12 +800,15 @@ ar71xx_board_detect() {
 	*"PB44 reference board")
 		name="pb44"
 		;;
-	*PB92)
-		name="pb92"
+	*"PQI Air Pen")
+		name="pqi-air-pen"
 		;;
 	*"Qihoo 360 C301")
 		name="qihoo-c301"
 		;;
+	*"RE450")
+		name="re450"
+		;;
 	*"RouterBOARD 411/A/AH")
 		name="rb-411"
 		;;
@@ -798,6 +842,12 @@ ar71xx_board_detect() {
 	*"RouterBOARD 750GL")
 		name="rb-750gl"
 		;;
+	*"RouterBOARD 750 r2")
+		name="rb-750-r2"
+		;;
+	*"RouterBOARD 750UP r2")
+		name="rb-750up-r2"
+		;;
 	*"RouterBOARD 751")
 		name="rb-751"
 		;;
@@ -819,12 +869,18 @@ ar71xx_board_detect() {
 	*"RouterBOARD 912UAG-5HPnD")
 		name="rb-912uag-5hpnd"
 		;;
+	*"RouterBOARD 941-2nD")
+		name="rb-941-2nd"
+		;;
 	*"RouterBOARD 951G-2HnD")
 		name="rb-951g-2hnd"
 		;;
 	*"RouterBOARD 951Ui-2HnD")
 		name="rb-951ui-2hnd"
 		;;
+	*"951Ui-2nD")
+		name="rb-951ui-2nd"
+		;;
 	*"RouterBOARD 2011L")
 		name="rb-2011l"
 		;;
@@ -840,6 +896,9 @@ ar71xx_board_detect() {
 	*"RouterBOARD 2011UiAS-2HnD")
 		name="rb-2011uias-2hnd"
 		;;
+	*"RouterBOARD mAP L-2nD")
+		name="rb-mapl-2nd"
+		;;
 	*"RouterBOARD SXT Lite2")
 		name="rb-sxt2n"
 		;;
@@ -865,6 +924,15 @@ ar71xx_board_detect() {
 	*RW2458N)
 		name="rw2458n"
 		;;
+	*SC1750)
+		name="sc1750"
+		;;
+	*SC300M)
+		name="sc300m"
+		;;
+	*SC450)
+		name="sc450"
+		;;
 	*"SMART-300")
 		name="smart-300"
 		;;
@@ -877,6 +945,9 @@ ar71xx_board_detect() {
 	*SOM9331)
 		name="som9331"
 		;;
+	*SR3200)
+		name="sr3200"
+		;;
 	*TEW-632BRP)
 		name="tew-632brp"
 		;;
@@ -901,6 +972,9 @@ ar71xx_board_detect() {
 	*"TL-WR1043ND v2")
 		name="tl-wr1043nd-v2"
 		;;
+	*"TL-WR1043ND v4")
+		name="tl-wr1043nd-v4"
+		;;
 	*TL-WR2543N*)
 		name="tl-wr2543n"
 		;;
@@ -943,6 +1017,9 @@ ar71xx_board_detect() {
 	*TL-WA850RE)
 		name="tl-wa850re"
 		;;
+	*"TL-WA850RE v2")
+		name="tl-wa850re-v2"
+		;;
 	*TL-WA860RE)
 		name="tl-wa860re"
 		;;
@@ -958,6 +1035,9 @@ ar71xx_board_detect() {
 	*"TL-WR802N v1")
 		name="tl-wr802n-v1"
 		;;
+	*"TL-WR802N v2")
+		name="tl-wr802n-v2"
+		;;
 	*TL-WA901ND)
 		name="tl-wa901nd"
 		;;
@@ -1024,6 +1104,9 @@ ar71xx_board_detect() {
 	*"TL-WR941N/ND v6")
 		name="tl-wr941nd-v6"
 		;;
+	*"TL-WR940N v4")
+		name="tl-wr940n-v4"
+		;;
 	*"TL-WR703N v1")
 		name="tl-wr703n"
 		;;
@@ -1162,6 +1245,9 @@ ar71xx_board_detect() {
 	*WHR-HP-G300N)
 		name="whr-hp-g300n"
 		;;
+	*XD3200)
+		name="xd3200"
+		;;
 	*Z1)
 		name="z1"
 		;;
@@ -1183,6 +1269,9 @@ ar71xx_board_detect() {
 	"8devices Carambola2"*)
 		name="carambola2"
 		;;
+	"8devices Lima"*)
+		name="lima"
+		;;
 	*"Sitecom WLR-8100")
 		name="wlr8100"
 		;;