X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ae0a750c4b479d23cc0cac0e9ce7414949052a32..603bb2bb6eb39ac30cf4a71f3727bc15b4ee45a1:/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 fa730107f..be42aad9e 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -6,18 +6,22 @@
 AR71XX_BOARD_NAME=
 AR71XX_MODEL=
 
-ar71xx_get_mem_total() {
-	$(awk '/MemTotal:/ {print($2)}' /proc/meminfo)
-}
+ar71xx_get_mtd_offset_size_format() {
+	local mtd="$1"
+	local offset="$2"
+	local size="$3"
+	local format="$4"
+	local dev
 
-ar71xx_get_mtd_part_magic() {
-	local part="$1"
-	local mtd
+	dev=$(find_mtd_part $mtd)
+	[ -z "$dev" ] && return
 
-	mtd=$(find_mtd_part $part)
-	[ -z "$mtd" ] && return
+	dd if=$dev bs=1 skip=$offset count=$size 2>/dev/null | hexdump -v -e "1/1 \"$format\""
+}
 
-	dd if=$mtd bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+ar71xx_get_mtd_part_magic() {
+	local mtd="$1"
+	ar71xx_get_mtd_offset_size_format "$mtd" 0 4 %02x
 }
 
 wndr3700_board_detect() {
@@ -33,13 +37,12 @@ wndr3700_board_detect() {
 		machine="NETGEAR WNDR3700"
 		;;
 	"33373031")
-		local mt
-
-		mt=$(ar71xx_get_mem_total)
-		if [ "$mt" -lt "65536" ]; then
+		local model
+		model=$(ar71xx_get_mtd_offset_size_format art 56 10 %c)
+		if [ -z "$model" ] || [ "$model" = $'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff' ]; then
 			machine="NETGEAR WNDR3700v2"
 		else
-			machine="NETGEAR WNDR3800"
+			machine="NETGEAR $model"
 		fi
 		;;
 	esac
@@ -70,6 +73,9 @@ tplink_board_detect() {
 	"070300"*)
 		model="TP-Link TL-WR703N"
 		;;
+	"070100"*)
+		model="TP-Link TL-WA701N/ND"
+		;;
 	"074000"*)
 		model="TP-Link TL-WR740N/ND"
 		;;
@@ -82,6 +88,9 @@ tplink_board_detect() {
 	"084100"*)
 		model="TP-Link TL-WR841N/ND"
 		;;
+	"084200"*)
+		model="TP-Link TL-WR842N/ND"
+		;;
 	"090100"*)
 		model="TP-Link TL-WA901N/ND"
 		;;
@@ -91,6 +100,15 @@ tplink_board_detect() {
 	"104300"*)
 		model="TP-Link TL-WR1043N/ND"
 		;;
+	"254300"*)
+		model="TP-Link TL-WR2543N/ND"
+		;;
+	"110101"*)
+		model="TP-Link TL-MR11U"
+		;;
+	"302000"*)
+		model="TP-Link TL-MR3020"
+		;;
 	"322000"*)
 		model="TP-Link TL-MR3220"
 		;;
@@ -115,9 +133,18 @@ ar71xx_board_detect() {
 	*"AirRouter")
 		name="airrouter"
 		;;
+	*"ALFA Network AP96")
+		name="alfa-ap96"
+		;;
+	*"ALFA Network N2/N5")
+		name="alfa-nx"
+		;;
 	*ALL0258N)
 		name="all0258n"
 		;;
+	*AP113)
+		name="ap113"
+		;;
 	*AP121)
 		name="ap121"
 		;;
@@ -130,18 +157,21 @@ ar71xx_board_detect() {
 	*AP83)
 		name="ap83"
 		;;
-	*AP96)
+	*"Atheros AP96")
 		name="ap96"
 		;;
 	*AW-NR580)
 		name="aw-nr580"
 		;;
-	*DB120)
+	*"DB120 reference board")
 		name="db120"
 		;;
 	*"DIR-600 rev. A1")
 		name="dir-600-a1"
 		;;
+	*"DIR-615 rev. E4")
+		name="dir-615-e4"
+		;;
 	*"DIR-825 rev. B1")
 		name="dir-825-b1"
 		;;
@@ -151,6 +181,9 @@ ar71xx_board_detect() {
 	*JA76PF)
 		name="ja76pf"
 		;;
+	*JA76PF2)
+		name="ja76pf2"
+		;;
 	*"Bullet M")
 		name="bullet-m"
 		;;
@@ -160,6 +193,9 @@ ar71xx_board_detect() {
 	*JWAP003)
 		name="jwap003"
 		;;
+	*"Hornet-UB")
+		name="hornet-ub"
+		;;
 	*LS-SR71)
 		name="ls-sr71"
 		;;
@@ -211,6 +247,9 @@ ar71xx_board_detect() {
 	*"RouterBOARD 750")
 		name="rb-750"
 		;;
+	*"RouterBOARD 750GL")
+		name="rb-750gl"
+		;;
 	*"Rocket M")
 		name="rocket-m"
 		;;
@@ -220,15 +259,27 @@ ar71xx_board_detect() {
 	*"RouterStation Pro")
 		name="routerstation-pro"
 		;;
+	*RW2458N)
+		name="rw2458n"
+		;;
 	*TEW-632BRP)
 		name="tew-632brp"
 		;;
+	*TEW-673GRU)
+		name="tew-673gru"
+		;;
 	*TL-WR1043ND)
 		name="tl-wr1043nd"
 		;;
+	*TL-WR2543N*)
+		name="tl-wr2543n"
+		;;
 	*"DIR-615 rev. C1")
 		name="dir-615-c1"
 		;;
+	*TL-MR3020)
+		name="tl-mr3020"
+		;;
 	*TL-MR3220)
 		name="tl-mr3220"
 		;;
@@ -250,12 +301,18 @@ ar71xx_board_detect() {
 	*"TL-WR841N v1")
 		name="tl-wr841n-v1"
 		;;
+	*"TL-WR841N/ND v7")
+		name="tl-wr841n-v7"
+		;;
 	*TL-WR941ND)
 		name="tl-wr941nd"
 		;;
 	*"TL-WR703N v1")
 		name="tl-wr703n"
 		;;
+	*"TL-MR11U")
+		name="tl-mr11u"
+		;;
 	*UniFi)
 		name="unifi"
 		;;
@@ -268,7 +325,10 @@ ar71xx_board_detect() {
 	*WP543)
 		name="wp543"
 		;;
-	*"WNDR3700/WNDR3800")
+	*WPE72)
+		name="wpe72"
+		;;
+	*"WNDR3700/WNDR3800/WNDRMAC")
 		wndr3700_board_detect "$machine"
 		;;
 	*WNR2000)
@@ -289,6 +349,9 @@ ar71xx_board_detect() {
 	*WZR-HP-G450H)
 		name="wzr-hp-g450h"
 		;;
+	*WZR-HP-G300NH2)
+		name="wzr-hp-g300nh2"
+		;;
 	*WHR-HP-G300N)
 		name="whr-hp-g300n"
 		;;