From 29c6de9eac898841b7fbb2d41d1fef27753ae76b Mon Sep 17 00:00:00 2001
From: RISCi_ATOM <bob@bobcall.me>
Date: Wed, 20 Feb 2019 14:46:15 -0500
Subject: [PATCH] Fix TL-WR1043Nv5 image gen. for factory/tftp flash.

---
 target/linux/ar71xx/image/tp-link.mk | 34 ++++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
index cf318586c8..aa271a8079 100644
--- a/target/linux/ar71xx/image/tp-link.mk
+++ b/target/linux/ar71xx/image/tp-link.mk
@@ -104,11 +104,8 @@ $(Device/tplink)
 endef
 
 define Device/archer-cxx
+  $(Device/tplink-ldr)
   KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
-  IMAGES := sysupgrade.bin factory.bin
-  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
-	append-metadata | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
 endef
 
 define Device/cpe510-520
@@ -751,17 +748,6 @@ define Device/tl-wr1041n-v2
 endef
 TARGET_DEVICES += tl-wr1041n-v2
 
-define Device/tl-wr1043n-v5
-    $(Device/archer-cxx)
-    DEVICE_TITLE := TP-LINK TL-WR1043N v5
-    BOARDNAME := TL-WR1043N-v5
-    SUPPORTED_DEVICES := tl-wr1043n-v5
-    DEVICE_PROFILE := TLWR1043
-    MTDPARTS := spi0.0:128k(factory-uboot)ro,128k(u-boot)ro,15104k(firmware),128k(product-info)ro,640k(config)ro,64k(partition-table)ro,128k(logs)ro,64k(art)ro
-    IMAGE_SIZE := 15104k
-    TPLINK_BOARD_ID := TLWR1043NV5
-endef
-
 define Device/tl-wr1043nd-v1
     $(Device/tplink-8m)
     DEVICE_TITLE := TP-LINK TL-WR1043N/ND v1
@@ -805,6 +791,24 @@ define Device/tl-wr1043nd-v4
     IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
     IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
 endef
+
+define Device/tl-wr1043n-v5
+    $(Device/tplink)
+    DEVICE_TITLE := TP-LINK TL-WR1043N v5
+    DEVICE_PACKAGES :=
+    BOARDNAME := TL-WR1043N-v5
+    DEVICE_PROFILE := TLWR1043
+    TPLINK_HWID :=  0x10430005
+    TPLINK_FLASHLAYOUT := 16Msafeloader
+    MTDPARTS := spi0.0:128k(factory-uboot)ro,128k(u-boot)ro,15104k(firmware),128k(product-info)ro,640k(config)ro,64k(partition-table)ro,128k(logs)ro,64k(art)ro
+    IMAGE_SIZE := 15104k
+    TPLINK_BOARD_NAME := TLWR1043NV5
+    KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
+    IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
+	append-metadata | check-size $$$$(IMAGE_SIZE)
+    IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
+endef
+
 TARGET_DEVICES += tl-wr1043nd-v1 tl-wr1043nd-v2 tl-wr1043nd-v3 tl-wr1043nd-v4 tl-wr1043n-v5
 
 define Device/tl-wr2543-v1
-- 
2.25.1