ath79: add support for TP-Link CPE610 v2

[oweals/openwrt.git] / target / linux / ath79 / image / generic-tp-link.mk

diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 8915552322932efbbf43356069051ef53e7b168c..967eb2a7c3805062cb019eaca3a25d19d2bcff85 100644 (file)
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -2,46 +2,47 @@ include ./common-tp-link.mk
 
 define Device/tplink_archer-a7-v5
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15104k
   DEVICE_MODEL := Archer A7
   DEVICE_VARIANT := v5
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+       ath10k-firmware-qca988x-ct
   TPLINK_BOARD_ID := ARCHER-A7-V5
   BOARDNAME := ARCHER-A7-V5
-  SUPPORTED_DEVICES += archer-a7-v5
 endef
 TARGET_DEVICES += tplink_archer-a7-v5
 
 define Device/tplink_archer-c2-v3
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C2
   DEVICE_VARIANT := v3
-  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct
+  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct
   TPLINK_BOARD_ID := ARCHER-C2-V3
 endef
 TARGET_DEVICES += tplink_archer-c2-v3
 
 define Device/tplink_archer-c25-v1
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C25
   DEVICE_VARIANT := v1
   TPLINK_BOARD_ID := ARCHER-C25-V1
-  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct
+  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct
   SUPPORTED_DEVICES += archer-c25-v1
 endef
 TARGET_DEVICES += tplink_archer-c25-v1
 
 define Device/tplink_archer-c5-v1
   $(Device/tplink-16mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := Archer C5
   DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+       ath10k-firmware-qca988x-ct
   TPLINK_HWID := 0xc5000001
   SUPPORTED_DEVICES += archer-c5
 endef
@@ -49,43 +50,45 @@ TARGET_DEVICES += tplink_archer-c5-v1
 
 define Device/tplink_archer-c58-v1
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 7936k
   DEVICE_MODEL := Archer C58
   DEVICE_VARIANT := v1
   TPLINK_BOARD_ID := ARCHER-C58-V1
-  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
+  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct
   SUPPORTED_DEVICES += archer-c58-v1
 endef
 TARGET_DEVICES += tplink_archer-c58-v1
 
 define Device/tplink_archer-c59-v1
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 14528k
   DEVICE_MODEL := Archer C59
   DEVICE_VARIANT := v1
   TPLINK_BOARD_ID := ARCHER-C59-V1
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca9888-ct
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+       ath10k-firmware-qca9888-ct
   SUPPORTED_DEVICES += archer-c59-v1
 endef
 TARGET_DEVICES += tplink_archer-c59-v1
 
 define Device/tplink_archer-c59-v2
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 14400k
   DEVICE_MODEL := Archer C59
   DEVICE_VARIANT := v2
   TPLINK_BOARD_ID := ARCHER-C59-V2
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca9888-ct
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+       ath10k-firmware-qca9888-ct
   SUPPORTED_DEVICES += archer-c59-v2
 endef
 TARGET_DEVICES += tplink_archer-c59-v2
 
 define Device/tplink_archer-c6-v2
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C6
   DEVICE_VARIANT := v2 (EU/RU/JP)
@@ -96,7 +99,7 @@ TARGET_DEVICES += tplink_archer-c6-v2
 
 define Device/tplink_archer-c6-v2-us
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15872k
   DEVICE_MODEL := Archer C6
   DEVICE_VARIANT := v2 (US)
@@ -110,31 +113,42 @@ TARGET_DEVICES += tplink_archer-c6-v2-us
 
 define Device/tplink_archer-c60-v1
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 7936k
   DEVICE_MODEL := Archer C60
   DEVICE_VARIANT := v1
   TPLINK_BOARD_ID := ARCHER-C60-V1
-  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
+  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct
   SUPPORTED_DEVICES += archer-c60-v1
 endef
 TARGET_DEVICES += tplink_archer-c60-v1
 
 define Device/tplink_archer-c60-v2
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9561
+  SOC := qca9561
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C60
   DEVICE_VARIANT := v2
   TPLINK_BOARD_ID := ARCHER-C60-V2
-  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
+  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct
   SUPPORTED_DEVICES += archer-c60-v2
 endef
 TARGET_DEVICES += tplink_archer-c60-v2
 
+define Device/tplink_archer-c60-v3
+  $(Device/tplink-safeloader-uimage)
+  SOC := qca9561
+  IMAGE_SIZE := 7808k
+  DEVICE_MODEL := Archer C60
+  DEVICE_VARIANT := v3
+  TPLINK_BOARD_ID := ARCHER-C60-V3
+  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct
+endef
+TARGET_DEVICES += tplink_archer-c60-v3
+
 define Device/tplink_archer-c7-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := Archer C7
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -145,25 +159,27 @@ TARGET_DEVICES += tplink_archer-c7-v1
 
 define Device/tplink_archer-c7-v2
   $(Device/tplink-16mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := Archer C7
   DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+       ath10k-firmware-qca988x-ct
   TPLINK_HWID := 0xc7000002
   SUPPORTED_DEVICES += archer-c7
   IMAGES += factory-us.bin factory-eu.bin
-  IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US
-  IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU
+  IMAGE/factory-us.bin := tplink-v1-image factory -C US
+  IMAGE/factory-eu.bin := tplink-v1-image factory -C EU
 endef
 TARGET_DEVICES += tplink_archer-c7-v2
 
 define Device/tplink_archer-c7-v4
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15104k
   DEVICE_MODEL := Archer C7
   DEVICE_VARIANT := v4
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+       ath10k-firmware-qca988x-ct
   TPLINK_BOARD_ID := ARCHER-C7-V4
   BOARDNAME := ARCHER-C7-V4
   SUPPORTED_DEVICES += archer-c7-v4
@@ -172,11 +188,12 @@ TARGET_DEVICES += tplink_archer-c7-v4
 
 define Device/tplink_archer-c7-v5
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15360k
   DEVICE_MODEL := Archer C7
   DEVICE_VARIANT := v5
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+       ath10k-firmware-qca988x-ct
   TPLINK_BOARD_ID := ARCHER-C7-V5
   BOARDNAME := ARCHER-C7-V5
   SUPPORTED_DEVICES += archer-c7-v5
@@ -184,30 +201,54 @@ endef
 TARGET_DEVICES += tplink_archer-c7-v5
 
 define Device/tplink_archer-d50-v1
-  ATH_SOC := qca9531
-  DEVICE_VENDOR := TP-Link
+  $(Device/tplink-v2)
+  SOC := qca9531
   DEVICE_MODEL := Archer D50
   DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport \
+       kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
   BOARDNAME := ARCHER-D50-V1
   IMAGE_SIZE := 7808k
   TPLINK_HWID := 0xC1200001
   TPLINK_HWREV := 0x00000046
   TPLINK_FLASHLAYOUT := 8Mqca
-  TPLINK_HWREVADD := 0x00000000
-  TPLINK_HVERSION := 3
-  KERNEL := kernel-bin | append-dtb | lzma
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | \
-        tplink-v2-header -s -V "ver. 1.0"
-  IMAGES := sysupgrade.bin
-  IMAGE/sysupgrade.bin := tplink-v2-image -s -V "ver. 2.0" | \
-        append-metadata | check-size $$$$(IMAGE_SIZE)
+       tplink-v2-header -s -V "ver. 1.0"
 endef
 TARGET_DEVICES += tplink_archer-d50-v1
 
+define Device/tplink_archer-d7-v1
+  $(Device/tplink-v2)
+  SOC := qca9558
+  DEVICE_MODEL := Archer D7
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport \
+       kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  IMAGE_SIZE := 15936k
+  TPLINK_HWID := 0x89300001
+  TPLINK_HWREV := 0x0000002D
+  TPLINK_FLASHLAYOUT := 16Mqca
+  TPLINK_HWREVADD := 0x00000002
+endef
+TARGET_DEVICES += tplink_archer-d7-v1
+
+define Device/tplink_archer-d7b-v1
+  $(Device/tplink-v2)
+  SOC := qca9558
+  DEVICE_MODEL := Archer D7b
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport \
+       kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  IMAGE_SIZE := 16000k
+  TPLINK_HWID := 0x89300001
+  TPLINK_HWREV := 0x0000003D
+  TPLINK_FLASHLAYOUT := 16Mqca
+endef
+TARGET_DEVICES += tplink_archer-d7b-v1
+
 define Device/tplink_cpe210-v1
-  $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE210
   DEVICE_VARIANT := v1
@@ -219,7 +260,7 @@ TARGET_DEVICES += tplink_cpe210-v1
 
 define Device/tplink_cpe210-v2
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9533
+  SOC := qca9533
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE210
   DEVICE_VARIANT := v2
@@ -232,7 +273,7 @@ TARGET_DEVICES += tplink_cpe210-v2
 
 define Device/tplink_cpe210-v3
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9533
+  SOC := qca9533
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE210
   DEVICE_VARIANT := v3
@@ -244,8 +285,8 @@ endef
 TARGET_DEVICES += tplink_cpe210-v3
 
 define Device/tplink_cpe220-v2
-  $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE220
   DEVICE_VARIANT := v2
@@ -256,7 +297,7 @@ TARGET_DEVICES += tplink_cpe220-v2
 
 define Device/tplink_cpe220-v3
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9533
+  SOC := qca9533
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE220
   DEVICE_VARIANT := v3
@@ -267,8 +308,8 @@ endef
 TARGET_DEVICES += tplink_cpe220-v3
 
 define Device/tplink_cpe510-v1
-  $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE510
   DEVICE_VARIANT := v1
@@ -279,8 +320,8 @@ endef
 TARGET_DEVICES += tplink_cpe510-v1
 
 define Device/tplink_cpe510-v2
-  $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE510
   DEVICE_VARIANT := v2
@@ -291,20 +332,19 @@ endef
 TARGET_DEVICES += tplink_cpe510-v2
 
 define Device/tplink_cpe510-v3
-  $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE510
   DEVICE_VARIANT := v3
   DEVICE_PACKAGES := rssileds
   TPLINK_BOARD_ID := CPE510V3
-  SUPPORTED_DEVICES += cpe510-v3
 endef
 TARGET_DEVICES += tplink_cpe510-v3
 
 define Device/tplink_cpe610-v1
-  $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := CPE610
   DEVICE_VARIANT := v1
@@ -312,26 +352,32 @@ define Device/tplink_cpe610-v1
 endef
 TARGET_DEVICES += tplink_cpe610-v1
 
+define Device/tplink_cpe610-v2
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
+  IMAGE_SIZE := 7680k
+  DEVICE_MODEL := CPE610
+  DEVICE_VARIANT := v2
+  TPLINK_BOARD_ID := CPE610V2
+endef
+TARGET_DEVICES += tplink_cpe610-v2
+
 define Device/tplink_re350k-v1
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9558
+  SOC := qca9558
   IMAGE_SIZE := 13760k
   DEVICE_MODEL := RE350K
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
   TPLINK_BOARD_ID := RE350K-V1
-  TPLINK_HWID := 0x0
-  TPLINK_HWREV := 0
 endef
 TARGET_DEVICES += tplink_re350k-v1
 
 define Device/tplink_rex5x-v1
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9558
+  SOC := qca9558
   IMAGE_SIZE := 6016k
-  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
-  TPLINK_HWID := 0x0
-  TPLINK_HWREV := 0
+  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
 endef
 
 define Device/tplink_re355-v1
@@ -354,21 +400,43 @@ TARGET_DEVICES += tplink_re450-v1
 
 define Device/tplink_re450-v2
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 6016k
   DEVICE_MODEL := RE450
   DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
-  TPLINK_HWID := 0x0
-  TPLINK_HWREV := 0
+  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
   TPLINK_BOARD_ID := RE450-V2
   LOADER_TYPE := elf
 endef
 TARGET_DEVICES += tplink_re450-v2
 
+define Device/tplink_re450-v3
+  $(Device/tplink-safeloader)
+  SOC := qca9563
+  IMAGE_SIZE := 7808k
+  DEVICE_MODEL := RE450
+  DEVICE_VARIANT := v3
+  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
+  TPLINK_BOARD_ID := RE450-V3
+  LOADER_TYPE := elf
+endef
+TARGET_DEVICES += tplink_re450-v3
+
+define Device/tplink_tl-mr6400-v1
+  $(Device/tplink-8mlzma)
+  SOC := qca9531
+  DEVICE_MODEL := TL-MR6400
+  DEVICE_VARIANT := v1
+  TPLINK_HWID := 0x64000001
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial \
+       kmod-usb-serial-option adb-enablemodem
+  SUPPORTED_DEVICES += tl-mr6400
+endef
+TARGET_DEVICES += tplink_tl-mr6400-v1
+
 define Device/tplink_tl-wdr3500-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := TL-WDR3500
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -379,7 +447,7 @@ TARGET_DEVICES += tplink_tl-wdr3500-v1
 
 define Device/tplink_tl-wdr3600-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := TL-WDR3600
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -390,7 +458,7 @@ TARGET_DEVICES += tplink_tl-wdr3600-v1
 
 define Device/tplink_tl-wdr4300-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := TL-WDR4300
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -401,7 +469,7 @@ TARGET_DEVICES += tplink_tl-wdr4300-v1
 
 define Device/tplink_tl-wdr4300-v1-il
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9344
+  SOC := ar9344
   DEVICE_MODEL := TL-WDR4300
   DEVICE_VARIANT := v1 (IL)
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -410,19 +478,31 @@ define Device/tplink_tl-wdr4300-v1-il
 endef
 TARGET_DEVICES += tplink_tl-wdr4300-v1-il
 
+define Device/tplink_tl-wdr4310-v1
+  $(Device/tplink-8mlzma)
+  SOC := ar9344
+  DEVICE_MODEL := TL-WDR4310
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
+  TPLINK_HWID := 0x43100001
+  SUPPORTED_DEVICES += tl-wdr4300
+endef
+TARGET_DEVICES += tplink_tl-wdr4310-v1
+
 define Device/tplink_tl-wdr4900-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := TL-WDR4900
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x49000002
+  SUPPORTED_DEVICES += tl-wdr4900-v2
 endef
 TARGET_DEVICES += tplink_tl-wdr4900-v2
 
 define Device/tplink_tl-wr1043nd-v1
   $(Device/tplink-8m)
-  ATH_SOC := ar9132
+  SOC := ar9132
   DEVICE_MODEL := TL-WR1043N/ND
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -433,7 +513,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v1
 
 define Device/tplink_tl-wr1043nd-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := TL-WR1043N/ND
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -444,7 +524,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v2
 
 define Device/tplink_tl-wr1043nd-v3
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := TL-WR1043N/ND
   DEVICE_VARIANT := v3
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -455,7 +535,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v3
 
 define Device/tplink_tl-wr1043nd-v4
   $(Device/tplink-safeloader)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15552k
   DEVICE_MODEL := TL-WR1043N/ND
   DEVICE_VARIANT := v4
@@ -468,7 +548,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v4
 
 define Device/tplink_tl-wr1043n-v5
   $(Device/tplink-safeloader-uimage)
-  ATH_SOC := qca9563
+  SOC := qca9563
   IMAGE_SIZE := 15104k
   DEVICE_MODEL := TL-WR1043N
   DEVICE_VARIANT := v5
@@ -479,7 +559,7 @@ TARGET_DEVICES += tplink_tl-wr1043n-v5
 
 define Device/tplink_tl-wr1045nd-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9558
+  SOC := qca9558
   DEVICE_MODEL := TL-WR1045ND
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -489,21 +569,21 @@ TARGET_DEVICES += tplink_tl-wr1045nd-v2
 
 define Device/tplink_tl-wr2543-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar7242
+  SOC := ar7242
   DEVICE_MODEL := TL-WR2543N/ND
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x25430001
-  IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade -v 3.13.99 | \
-    append-metadata | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.bin := append-rootfs | mktplinkfw factory -v 3.13.99
-  SUPPORTED_DEVICES += tl-wr2543-v1
+  IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade -v 3.13.99 | \
+       append-metadata | check-size
+  IMAGE/factory.bin := tplink-v1-image factory -v 3.13.99
+  SUPPORTED_DEVICES += tl-wr2543n
 endef
 TARGET_DEVICES += tplink_tl-wr2543-v1
 
 define Device/tplink_tl-wr710n-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9331
+  SOC := ar9331
   DEVICE_MODEL := TL-WR710N
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-usb-ledtrig-usbport
@@ -514,36 +594,39 @@ TARGET_DEVICES += tplink_tl-wr710n-v1
 
 define Device/tplink_tl-wr810n-v1
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9531
+  SOC := qca9531
   DEVICE_MODEL := TL-WR810N
   DEVICE_VARIANT := v1
   TPLINK_HWID := 0x8100001
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += tl-wr810n
 endef
 TARGET_DEVICES += tplink_tl-wr810n-v1
 
 define Device/tplink_tl-wr810n-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_MODEL := TL-WR810N
   DEVICE_VARIANT := v2
   TPLINK_HWID := 0x8100002
+  SUPPORTED_DEVICES += tl-wr810n-v2
 endef
 TARGET_DEVICES += tplink_tl-wr810n-v2
 
 define Device/tplink_tl-wr842n-v1
   $(Device/tplink-8m)
-  ATH_SOC := ar7241
+  SOC := ar7241
   DEVICE_MODEL := TL-WR842N/ND
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x8420001
+  SUPPORTED_DEVICES += tl-mr3420
 endef
 TARGET_DEVICES += tplink_tl-wr842n-v1
 
 define Device/tplink_tl-wr842n-v2
   $(Device/tplink-8mlzma)
-  ATH_SOC := ar9341
+  SOC := ar9341
   DEVICE_MODEL := TL-WR842N/ND
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -554,7 +637,7 @@ TARGET_DEVICES += tplink_tl-wr842n-v2
 
 define Device/tplink_tl-wr842n-v3
   $(Device/tplink-16mlzma)
-  ATH_SOC := qca9533
+  SOC := qca9533
   DEVICE_MODEL := TL-WR842N
   DEVICE_VARIANT := v3
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
@@ -563,9 +646,35 @@ define Device/tplink_tl-wr842n-v3
 endef
 TARGET_DEVICES += tplink_tl-wr842n-v3
 
+define Device/tplink_tl-wr902ac-v1
+  $(Device/tplink-safeloader)
+  SOC := qca9531
+  DEVICE_MODEL := TL-WR902AC
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport \
+       kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct \
+       -swconfig -uboot-envtools
+  TPLINK_BOARD_ID := TL-WR902AC-V1
+  IMAGE_SIZE := 7360k
+  SUPPORTED_DEVICES += tl-wr902ac-v1
+endef
+TARGET_DEVICES += tplink_tl-wr902ac-v1
+
+define Device/tplink_wbs210-v1
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
+  IMAGE_SIZE := 7680k
+  DEVICE_MODEL := WBS210
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := rssileds
+  TPLINK_BOARD_ID := WBS210
+  SUPPORTED_DEVICES += wbs210
+endef
+TARGET_DEVICES += tplink_wbs210-v1
+
 define Device/tplink_wbs210-v2
-  $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := WBS210
   DEVICE_VARIANT := v2
@@ -575,8 +684,8 @@ endef
 TARGET_DEVICES += tplink_wbs210-v2
 
 define Device/tplink_wbs510-v1
-  $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := WBS510
   DEVICE_VARIANT := v1
@@ -587,8 +696,8 @@ endef
 TARGET_DEVICES += tplink_wbs510-v1
 
 define Device/tplink_wbs510-v2
-  $(Device/tplink-loader-okli)
-  ATH_SOC := ar9344
+  $(Device/tplink-safeloader-okli)
+  SOC := ar9344
   IMAGE_SIZE := 7680k
   DEVICE_MODEL := WBS510
   DEVICE_VARIANT := v2