X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Far71xx.sh;h=3893747426569d0569399a0a864b114fa0354354;hp=2b083e192055ad08a570e10bc183a350e847a869;hb=037b42838f54aa2a90a31901029371c3ae9b8c03;hpb=0f254b4b67b400e093b8e8e0e22144dbdddcb7ad

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 2b083e1920..3893747426 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -53,6 +53,15 @@ wndr3700_board_detect() {
 	AR71XX_MODEL="$machine"
 }
 
+cybertan_get_hw_magic() {
+	local part
+
+	part=$(find_mtd_part firmware)
+	[ -z "$part" ] && return 1
+
+	dd bs=8 count=1 skip=0 if=$part 2>/dev/null | hexdump -v -n 8 -e '1/1 "%02x"'
+}
+
 tplink_get_hwid() {
 	local part
 
@@ -62,12 +71,22 @@ tplink_get_hwid() {
 	dd if=$part bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
 }
 
+tplink_get_mid() {
+	local part
+
+	part=$(find_mtd_part firmware)
+	[ -z "$part" ] && return 1
+
+	dd if=$part bs=4 count=1 skip=17 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
 tplink_board_detect() {
 	local model="$1"
 	local hwid
 	local hwver
 
 	hwid=$(tplink_get_hwid)
+	mid=$(tplink_get_mid)
 	hwver=${hwid:6:2}
 	hwver="v${hwver#0}"
 
@@ -75,6 +94,12 @@ tplink_board_detect() {
 	"070300"*)
 		model="TP-Link TL-WR703N"
 		;;
+	"071000"*)
+		model="TP-Link TL-WR710N"
+		;;
+	"072001"*)
+		model="TP-Link TL-WR720N"
+		;;
 	"070100"*)
 		model="TP-Link TL-WA701N/ND"
 		;;
@@ -87,17 +112,34 @@ tplink_board_detect() {
 	"074300"*)
 		model="TP-Link TL-WR743N/ND"
 		;;
+	"075000"*)
+		model="TP-Link TL-WA750RE"
+		;;
+	"080100"*)
+		model="TP-Link TL-WA801N/ND"
+		;;
+	"083000"*)
+		model="TP-Link TL-WA830RE"
+		;;
 	"084100"*)
 		model="TP-Link TL-WR841N/ND"
 		;;
 	"084200"*)
 		model="TP-Link TL-WR842N/ND"
 		;;
+	"085000"*)
+		model="TP-Link TL-WA850RE"
+		;;
 	"090100"*)
 		model="TP-Link TL-WA901N/ND"
 		;;
 	"094100"*)
-		model="TP-Link TL-WR941N/ND"
+		if [ "$hwid" == "09410002" -a "$mid" == "00420001" ]; then
+			model="Rosewill RNX-N360RT"
+			hwver=""
+		else
+			model="TP-Link TL-WR941N/ND"
+		fi
 		;;
 	"104100"*)
 		model="TP-Link TL-WR1041N/ND"
@@ -108,9 +150,15 @@ tplink_board_detect() {
 	"254300"*)
 		model="TP-Link TL-WR2543N/ND"
 		;;
-	"110101"*)
+	"001001"*)
+		model="TP-Link TL-MR10U"
+		;;
+	"001101"*)
 		model="TP-Link TL-MR11U"
 		;;
+	"001301"*)
+		model="TP-Link TL-MR13U"
+		;;
 	"302000"*)
 		model="TP-Link TL-MR3020"
 		;;
@@ -123,6 +171,9 @@ tplink_board_detect() {
 	"342000"*)
 		model="TP-Link TL-MR3420"
 		;;
+	"350000"*)
+		model="TP-Link TL-WDR3500"
+		;;
 	"360000"*)
 		model="TP-Link TL-WDR3600"
 		;;
@@ -132,6 +183,9 @@ tplink_board_detect() {
 	"431000"*)
 		model="TP-Link TL-WDR4310"
 		;;
+	"453000"*)
+		model="MERCURY MW4530R"
+		;;
 	*)
 		hwver=""
 		;;
@@ -174,8 +228,17 @@ ar71xx_board_detect() {
 	*AP121-MINI)
 		name="ap121-mini"
 		;;
-	*"AP136 reference board")
-		name="ap136"
+	*"AP132 reference board")
+		name="ap132"
+		;;
+	*"AP136-010 reference board")
+		name="ap136-010"
+		;;
+	*"AP136-020 reference board")
+		name="ap136-020"
+		;;
+	*"AP135-020 reference board")
+		name="ap135-020"
 		;;
 	*AP81)
 		name="ap81"
@@ -183,15 +246,24 @@ ar71xx_board_detect() {
 	*AP83)
 		name="ap83"
 		;;
+	*"Archer C7")
+		name="archer-c7"
+		;;
 	*"Atheros AP96")
 		name="ap96"
 		;;
 	*AW-NR580)
 		name="aw-nr580"
 		;;
+	*CAP4200AG)
+		name="cap4200ag"
+		;;
 	*"DB120 reference board")
 		name="db120"
 		;;
+	*"DIR-505 rev. A1")
+		name="dir-505-a1"
+		;;
 	*"DIR-600 rev. A1")
 		name="dir-600-a1"
 		;;
@@ -201,14 +273,14 @@ ar71xx_board_detect() {
 	*"DIR-825 rev. B1")
 		name="dir-825-b1"
 		;;
-	*"DIR-825 rev. B1 WHOLEFLASH")
-		name="dir-825-b1-wholeflash"
+	*"DIR-825 rev. C1")
+		name="dir-825-c1"
 		;;
-	*"DIR-825 rev. B1 TOWHOLEFLASH")
-		name="dir-825-b1-towholeflash"
+	*"DIR-835 rev. A1")
+		name="dir-835-a1"
 		;;
-	*"DIR-825 rev. B1 TOSTOCK")
-		name="dir-825-b1-tostock"
+	*"Dragino v2")
+		name="dragino2"
 		;;
 	*EAP7660D)
 		name="eap7660d"
@@ -229,11 +301,35 @@ ar71xx_board_detect() {
 		name="jwap003"
 		;;
 	*"Hornet-UB")
-		name="hornet-ub"
+		local size
+		size=$(awk '/firmware/ { print $2 }' /proc/mtd)
+
+		if [ "x$size" = "x00790000" ]; then
+			name="hornet-ub"
+		fi
+
+		if [ "x$size" = "x00f90000" ]; then
+			name="hornet-ub-x2"
+		fi
 		;;
 	*LS-SR71)
 		name="ls-sr71"
 		;;
+	*MR600v2)
+		name="mr600v2"
+		;;
+	*MR600)
+		name="mr600"
+		;;
+	*"My Net N600")
+		name="mynet-n600"
+		;;
+	*"My Net N750")
+		name="mynet-n750"
+		;;
+	*"WD My Net Wi-Fi Range Extender")
+		name="mynet-rext"
+		;;
 	*MZK-W04NU)
 		name="mzk-w04nu"
 		;;
@@ -246,6 +342,9 @@ ar71xx_board_detect() {
 	*OM2P)
 		name="om2p"
 		;;
+	*"OM2P HS")
+		name="om2p-hs"
+		;;
 	*"OM2P LC")
 		name="om2p-lc"
 		;;
@@ -270,6 +369,9 @@ ar71xx_board_detect() {
 	*"RouterBOARD 433UAH")
 		name="rb-433u"
 		;;
+	*"RouterBOARD 435G")
+		name="rb-435g"
+		;;
 	*"RouterBOARD 450")
 		name="rb-450"
 		;;
@@ -294,9 +396,15 @@ ar71xx_board_detect() {
 	*"RouterBOARD 751G")
 		name="rb-751g"
 		;;
+	*"RouterBOARD 951G-2HnD")
+		name="rb-951g-2hnd"
+		;;
 	*"RouterBOARD 2011L")
 		name="rb-2011l"
 		;;
+	*"RouterBOARD 2011UAS")
+		name="rb-2011uas"
+		;;
 	*"RouterBOARD 2011UAS-2HnD")
 		name="rb-2011uas-2hnd"
 		;;
@@ -321,12 +429,18 @@ ar71xx_board_detect() {
 	*TEW-712BR)
 		name="tew-712br"
 		;;
+	*TEW-732BR)
+		name="tew-732br"
+		;;
 	*"TL-WR1041N v2")
 		name="tl-wr1041n-v2"
 		;;
 	*TL-WR1043ND)
 		name="tl-wr1043nd"
 		;;
+	*"TL-WR1043ND v2")
+		name="tl-wr1043nd-v2"
+		;;
 	*TL-WR2543N*)
 		name="tl-wr2543n"
 		;;
@@ -336,18 +450,48 @@ ar71xx_board_detect() {
 	*TL-MR3020)
 		name="tl-mr3020"
 		;;
+	*TL-MR3040)
+		name="tl-mr3040"
+		;;
+	*"TL-MR3040 v2")
+		name="tl-mr3040-v2"
+		;;
 	*TL-MR3220)
 		name="tl-mr3220"
 		;;
+	*"TL-MR3220 v2")
+		name="tl-mr3220-v2"
+		;;
 	*TL-MR3420)
 		name="tl-mr3420"
 		;;
+	*"TL-MR3420 v2")
+		name="tl-mr3420-v2"
+		;;
+	*TL-WA750RE)
+		name="tl-wa750re"
+		;;
+	*TL-WA7510N)
+		name="tl-wa7510n"
+		;;
+	*TL-WA850RE)
+		name="tl-wa850re"
+		;;
+	*"TL-WA801ND v2")
+		name="tl-wa801nd-v2"
+		;;
 	*TL-WA901ND)
 		name="tl-wa901nd"
 		;;
 	*"TL-WA901ND v2")
 		name="tl-wa901nd-v2"
 		;;
+	*"TL-WA901ND v3")
+		name="tl-wa901nd-v3"
+		;;
+	*"TL-WDR3500")
+		name="tl-wdr3500"
+		;;
 	*"TL-WDR3600/4300/4310")
 		name="tl-wdr4300"
 		;;
@@ -363,18 +507,39 @@ ar71xx_board_detect() {
 	*"TL-WR841N/ND v7")
 		name="tl-wr841n-v7"
 		;;
+	*"TL-WR841N/ND v8")
+		name="tl-wr841n-v8"
+		;;
+	*"TL-WR842N/ND v2")
+		name="tl-wr842n-v2"
+		;;
 	*TL-WR941ND)
 		name="tl-wr941nd"
 		;;
 	*"TL-WR703N v1")
 		name="tl-wr703n"
 		;;
+	*"TL-WR710N v1")
+		name="tl-wr710n"
+		;;
+	*"TL-WR720N v3")
+		name="tl-wr720n-v3"
+		;;
+	*"TL-MR10U")
+		name="tl-mr10u"
+		;;
 	*"TL-MR11U")
 		name="tl-mr11u"
 		;;
+	*"TL-MR13U")
+		name="tl-mr13u"
+		;;
 	*UniFi)
 		name="unifi"
 		;;
+	*"UniFi AP Pro")
+		name="uap-pro"
+		;;
 	*WHR-G301N)
 		name="whr-g301n"
 		;;
@@ -384,25 +549,43 @@ ar71xx_board_detect() {
 	*WLAE-AG300N)
 		name="wlae-ag300n"
 		;;
+	*"UniFiAP Outdoor")
+		name="unifi-outdoor"
+		;;
 	*WP543)
 		name="wp543"
 		;;
 	*WPE72)
 		name="wpe72"
 		;;
+	*WNDAP360)
+		name="wndap360"
+		;;
 	*"WNDR3700/WNDR3800/WNDRMAC")
 		wndr3700_board_detect "$machine"
 		;;
+	*"WNDR4300")
+		name="wndr4300"
+		;;
+	*"WNR2000 V3")
+		name="wnr2000-v3"
+		;;
 	*WNR2000)
 		name="wnr2000"
 		;;
+	*WNR2200)
+		name="wnr2200"
+		;;
+	*"WNR612 V2")
+		name="wnr612-v2"
+		;;
 	*WRT160NL)
 		name="wrt160nl"
 		;;
 	*WRT400N)
 		name="wrt400n"
 		;;
-	*WZR-HP-AG300H)
+	*"WZR-HP-AG300H/WZR-600DHP")
 		name="wzr-hp-ag300h"
 		;;
 	*WZR-HP-G300NH)
@@ -429,10 +612,19 @@ ar71xx_board_detect() {
 	*EmbWir-Dorin-Router)
 		name="ew-dorin-router"
 		;;
+	"8devices Carambola2"*)
+		name="carambola2"
+		;;
+	*"Sitecom WLR-8100")
+		name="wlr8100"
+		;;
+	*"BHU BXU2000n-2 rev. A1")
+		name="bxu2000n-2-a1"
+		;;
 	esac
 
 	case "$machine" in
-	*TL-WR* | *TL-WA* | *TL-MR*)
+	*TL-WR* | *TL-WA* | *TL-MR* | *TL-WD*)
 		tplink_board_detect "$machine"
 		;;
 	esac