From 194dbffcf629dcd8b26ea25f98825471392392d8 Mon Sep 17 00:00:00 2001
From: imbrolla <2664456645@qq.com>
Date: Thu, 30 Nov 2017 03:28:52 +0800
Subject: [PATCH] fix tl wr2041n v1 tl wr2041n v2 tl wr941n v7

---
 target/linux/ar71xx/base-files/lib/ar71xx.sh | 11 +++++-
 target/linux/ar71xx/image/tp-link.mk         | 41 +++++++++-----------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index e6e698789..1c252ac27 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -263,9 +263,12 @@ tplink_board_detect() {
 	"120000"*)
 		model="MERCURY MAC1200R"
 		;;
-+	"031600"*)
+	"031600"*)
 		model="Mercury MW316R"
 		;;
+	"204100"*)
+		model="TP-Link TL-WR2041N"
+		;;
 	"254300"*)
 		model="TP-Link TL-WR2543N/ND"
 		;;
@@ -1151,6 +1154,12 @@ ar71xx_board_detect() {
 	*"TL-WR1043ND v4")
 		name="tl-wr1043nd-v4"
 		;;
+        *"TL-WR2041N v1")
+		name="tl-wr2041n-v1"
+		;;
+        *"TL-WR2041N v2")
+		name="tl-wr2041n-v2"
+		;;
 	*"TL-WR2543N"*)
 		name="tl-wr2543n"
 		;;
diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
index 1e0ef1b21..203d9a2af 100644
--- a/target/linux/ar71xx/image/tp-link.mk
+++ b/target/linux/ar71xx/image/tp-link.mk
@@ -1102,14 +1102,30 @@ define Device/tl-wr941nd-v6-cn
   TPLINK_HWID := 0x09410006
 endef
 
-define Device/tl-wr2041nd-v1
+define Device/tl-wr941n-v7
+    $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR941N/ND v7
+    BOARDNAME := TL-WR941N-v7
+    DEVICE_PROFILE := TLWR941
+    TPLINK_HWID := 0x09410007
+endef
+
+define Device/tl-wr2041n-v1
   $(Device/tplink-8mlzma)
-  DEVICE_TITLE := TP-LINK TL-WR2041N/ND v1
+  DEVICE_TITLE := TP-LINK TL-WR2041N v1
   BOARDNAME := TL-WDR3500
   DEVICE_PROFILE := TLWR2041
   TPLINK_HWID := 0x20410001
 endef
 
+define Device/tl-wr2041n-v2
+  $(Device/tplink-8mlzma)
+  DEVICE_TITLE := TP-LINK TL-WR2041N v2
+  BOARDNAME := TL-WR941N-v7
+  DEVICE_PROFILE := TLWR2041
+  TPLINK_HWID := 0x20410002
+endef
+
 define Device/tl-wr942n-v1
   DEVICE_TITLE := TP-LINK TL-WR942N v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
@@ -1125,17 +1141,7 @@ define Device/tl-wr942n-v1
   MTDPARTS := spi0.0:128k(u-boot)ro,1344k(kernel),13120k(rootfs),64k(product-info)ro,64k(partition-table)ro,256k(oem-config)ro,1344k(oem-vars)ro,64k(ART)ro,14464k@0x20000(firmware)
   SUPPORTED_DEVICES := tl-wr942n-v1
 endef
-
-TARGET_DEVICES += tl-wr940n-v4 tl-wr941nd-v2 tl-wr941nd-v3 tl-wr941nd-v4 tl-wr941nd-v5 tl-wr941nd-v6 tl-wr941nd-v6-cn tl-wr942n-v1 tl-wr2041nd-v1
-
-define Device/tl-wr941n-v7
-    $(Device/tplink-8mlzma)
-    DEVICE_TITLE := TP-LINK WR941N v7
-    BOARDNAME := TL-WR941N-v7
-    DEVICE_PROFILE := TLWR941
-    TPLINK_HWID := 0x09410007
-endef
-TARGET_DEVICES += tl-wr941n-v7
+TARGET_DEVICES += tl-wr940n-v4 tl-wr941nd-v2 tl-wr941nd-v3 tl-wr941nd-v4 tl-wr941nd-v5 tl-wr941nd-v6 tl-wr941nd-v6-cn tl-wr941n-v7 tl-wr942n-v1 tl-wr2041n-v1 tl-wr2041n-v2
 
 define Device/tl-wdr6500-v6
   $(Device/tplink-8mlzma)
@@ -1168,12 +1174,3 @@ define Device/tl-wr882n-v1
     TPLINK_HWID := 0x08820001
 endef
 TARGET_DEVICES += tl-wr882n-v1
-
-define Device/tl-wr2041nd-v2
-  $(Device/tplink-8mlzma)
-  DEVICE_TITLE := TP-LINK TL-WR2041N/ND v2
-  BOARDNAME := TL-WR941N-v7
-  DEVICE_PROFILE := TLWR2041
-  TPLINK_HWID := 0x20410002
-endef
-TARGET_DEVICES += tl-wr2041nd-v2