ath79: rename dts/image using manufacturer_board scheme

This helps getting rid of SUPPORTED_DEVICES which can be
auto-generated in image/Makefile.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>

36 files changed, 79 insertions, 84 deletions

diff --git a/target/linux/ath79/dts/ar7240_tl-wr740n-v2.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v2.dts
index 8754537754..8754537754 100644
--- a/target/linux/ath79/dts/ar7240_tl-wr740n-v2.dts
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v2.dts
diff --git a/target/linux/ath79/dts/ar7241_tp-link.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi
index 6cc515b7cc..6cc515b7cc 100644
--- a/target/linux/ath79/dts/ar7241_tp-link.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink.dtsi
diff --git a/target/linux/ath79/dts/ar7241_tl-mr3220-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
index c970c25446..3445fba55b 100644
--- a/target/linux/ath79/dts/ar7241_tl-mr3220-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7241_tl-mr3x20.dtsi"
+#include "ar7241_tplink_tl-mr3x20.dtsi"
 
 / {
 	compatible = "tplink,tl-mr3220-v1", "qca,ar7241";
diff --git a/target/linux/ath79/dts/ar7241_tl-mr3420-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
index e4c49f9a51..06b0264e31 100644
--- a/target/linux/ath79/dts/ar7241_tl-mr3420-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7241_tl-mr3x20.dtsi"
+#include "ar7241_tplink_tl-mr3x20.dtsi"
 
 / {
 	compatible = "tplink,tl-mr3420-v1", "qca,ar7241";
diff --git a/target/linux/ath79/dts/ar7241_tl-mr3x20.dtsi b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
index bd83cdb7c1..ad18945af4 100644
--- a/target/linux/ath79/dts/ar7241_tl-mr3x20.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "ar7241_tp-link.dtsi"
+#include "ar7241_tplink.dtsi"
 
 / {
 	gpio-export {
diff --git a/target/linux/ath79/dts/ar7241_tl-wr841-v7.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
index 980809f1ba..1aeeab7e21 100644
--- a/target/linux/ath79/dts/ar7241_tl-wr841-v7.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7241_tp-link.dtsi"
+#include "ar7241_tplink.dtsi"
 
 / {
 	compatible = "tplink,tl-wr841-v7", "qca,ar7241";
diff --git a/target/linux/ath79/dts/ar7242_tl-wr2543-v1.dts b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
index d7bb406ab0..d7bb406ab0 100644
--- a/target/linux/ath79/dts/ar7242_tl-wr2543-v1.dts
+++ b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
diff --git a/target/linux/ath79/dts/ar9132_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
index d01d2cc716..d01d2cc716 100644
--- a/target/linux/ath79/dts/ar9132_tl-wr1043nd-v1.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
diff --git a/target/linux/ath79/dts/ar9331_dpt_module.dts b/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts
index fb01ce43c6..fb01ce43c6 100644
--- a/target/linux/ath79/dts/ar9331_dpt_module.dts
+++ b/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts
diff --git a/target/linux/ath79/dts/ar9331_etactica-eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
index 5d6b72cd80..5d6b72cd80 100644
--- a/target/linux/ath79/dts/ar9331_etactica-eg200.dts
+++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
diff --git a/target/linux/ath79/dts/ar9331_omega.dts b/target/linux/ath79/dts/ar9331_onion_omega.dts
index cc47f56e84..cc47f56e84 100644
--- a/target/linux/ath79/dts/ar9331_omega.dts
+++ b/target/linux/ath79/dts/ar9331_onion_omega.dts
diff --git a/target/linux/ath79/dts/ar9331_tl-mr10u.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr10u.dts
index d92b5623ba..648020f96a 100644
--- a/target/linux/ath79/dts/ar9331_tl-mr10u.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr10u.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9331_tl-wr703n_tl-mr10u.dtsi"
+#include "ar9331_tplink_tl-wr703n_tl-mr10u.dtsi"
 
 / {
 	model = "TP-Link TL-MR10U";
diff --git a/target/linux/ath79/dts/ar9331_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
index 74db416ba6..74db416ba6 100644
--- a/target/linux/ath79/dts/ar9331_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
diff --git a/target/linux/ath79/dts/ar9331_tl-wr703n.dts b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n.dts
index da02e48662..21707d08f8 100644
--- a/target/linux/ath79/dts/ar9331_tl-wr703n.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9331_tl-wr703n_tl-mr10u.dtsi"
+#include "ar9331_tplink_tl-wr703n_tl-mr10u.dtsi"
 
 / {
 	model = "TP-Link TL-WR703N";
diff --git a/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
index d23dea7d92..d23dea7d92 100644
--- a/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
diff --git a/target/linux/ath79/dts/ar9331_tl-wr740nd-v4.dts b/target/linux/ath79/dts/ar9331_tplink_tl-wr740nd-v4.dts
index 583716308d..f3683f858b 100644
--- a/target/linux/ath79/dts/ar9331_tl-wr740nd-v4.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr740nd-v4.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9331_tl-wr741nd-v4.dtsi"
+#include "ar9331_tplink_tl-wr741nd-v4.dtsi"
 
 / {
 	model = "TP-Link TL-WR740N/ND v4";
diff --git a/target/linux/ath79/dts/ar9331_tl-wr741nd-v4.dts b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dts
index ef68cc7d22..46c140763a 100644
--- a/target/linux/ath79/dts/ar9331_tl-wr741nd-v4.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9331_tl-wr741nd-v4.dtsi"
+#include "ar9331_tplink_tl-wr741nd-v4.dtsi"
 
 / {
 	model = "TP-Link TL-WR741N/ND v4";
diff --git a/target/linux/ath79/dts/ar9331_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
index 9d8c1a022e..9d8c1a022e 100644
--- a/target/linux/ath79/dts/ar9331_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
diff --git a/target/linux/ath79/dts/ar9344_tl-wdr3600.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3600.dts
index d0886ee86b..95ee3490aa 100644
--- a/target/linux/ath79/dts/ar9344_tl-wdr3600.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3600.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tl-wdr4300.dtsi"
+#include "ar9344_tplink_tl-wdr4300.dtsi"
 
 / {
 	model = "TP-Link WDR3600";
diff --git a/target/linux/ath79/dts/ar9344_tl-wdr4300.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dts
index 617da57098..a6359309d2 100644
--- a/target/linux/ath79/dts/ar9344_tl-wdr4300.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tl-wdr4300.dtsi"
+#include "ar9344_tplink_tl-wdr4300.dtsi"
 
 / {
 	model = "TP-Link WDR4300";
diff --git a/target/linux/ath79/dts/ar9344_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
index 558a763747..558a763747 100644
--- a/target/linux/ath79/dts/ar9344_tl-wdr4300.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
diff --git a/target/linux/ath79/dts/qca9533_tl-wr841-v9.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v9.dts
index b82fd5adf9..179fada001 100644
--- a/target/linux/ath79/dts/qca9533_tl-wr841-v9.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v9.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9533_tl-wr841.dtsi"
+#include "qca9533_tplink_tl-wr841.dtsi"
 
 / {
 	compatible = "tplink,tl-wr841n-v9", "qca,qca9533";
diff --git a/target/linux/ath79/dts/qca9533_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index 4219125300..4219125300 100644
--- a/target/linux/ath79/dts/qca9533_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
diff --git a/target/linux/ath79/dts/qca9558_tl-archer-c7-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-archer-c7-v2.dts
index fdb35a1791..e096db7485 100644
--- a/target/linux/ath79/dts/qca9558_tl-archer-c7-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-archer-c7-v2.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9558_tl-archer-c7.dtsi"
+#include "qca9558_tplink_tl-archer-c7.dtsi"
 
 / {
 	compatible = "tplink,tl-archer-c7-v2", "qca,qca9558";
diff --git a/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-archer-c7.dtsi
index 6fb25a9d2e..6fb25a9d2e 100644
--- a/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-archer-c7.dtsi
diff --git a/target/linux/ath79/dts/qca9558_tl-wr1043nd-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd-v2.dts
index 0cfc486883..a2992c10fe 100644
--- a/target/linux/ath79/dts/qca9558_tl-wr1043nd-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd-v2.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9558_tl-wr1043nd.dtsi"
+#include "qca9558_tplink_tl-wr1043nd.dtsi"
 
 / {
 	compatible = "tplink,tl-wr1043nd-v2", "qca,qca9557";
diff --git a/target/linux/ath79/dts/qca9558_tl-wr1043nd-v3.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd-v3.dts
index c41129837c..a473cf42ea 100644
--- a/target/linux/ath79/dts/qca9558_tl-wr1043nd-v3.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd-v3.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9558_tl-wr1043nd.dtsi"
+#include "qca9558_tplink_tl-wr1043nd.dtsi"
 
 / {
 	compatible = "tplink,tl-wr1043nd-v3", "qca,qca9557";
diff --git a/target/linux/ath79/dts/qca9558_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index 4438f911fc..4438f911fc 100644
--- a/target/linux/ath79/dts/qca9558_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
diff --git a/target/linux/ath79/dts/qca9563_phicomm-k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
index 4ff9320d5c..4ff9320d5c 100644
--- a/target/linux/ath79/dts/qca9563_phicomm-k2t.dts
+++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
diff --git a/target/linux/ath79/dts/qca9563_tl-re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_tl-re450-v2.dts
index 646cdf2975..646cdf2975 100644
--- a/target/linux/ath79/dts/qca9563_tl-re450-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-re450-v2.dts
diff --git a/target/linux/ath79/dts/qca9563_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
index 6c56306ad5..6c56306ad5 100644
--- a/target/linux/ath79/dts/qca9563_tl-wr1043n.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
diff --git a/target/linux/ath79/dts/qca9563_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
index bc0f356000..5f48e6a5d1 100644
--- a/target/linux/ath79/dts/qca9563_tl-wr1043nd-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9563_tl-wr1043n.dtsi"
+#include "qca9563_tplink_tl-wr1043n.dtsi"
 
 / {
 	compatible = "tplink,tl-wr1043nd-v4", "qca,qca9563";
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 537dafa152..49b28f7599 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -1,19 +1,18 @@
 include ./common-tp-link.mk
 
-define Device/tl-archer-c7-v2
+define Device/tplink_tl-archer-c7-v2
   $(Device/tplink-16mlzma)
   ATH_SOC := qca9558
   DEVICE_TITLE := TP-LINK Archer C7 v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x
   TPLINK_HWID := 0xc7000002
-  SUPPORTED_DEVICES := tplink,tl-archer-c7-v2
   IMAGES := sysupgrade.bin factory.bin 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
 endef
-TARGET_DEVICES += tl-archer-c7-v2
+TARGET_DEVICES += tplink_tl-archer-c7-v2
 
-define Device/tl-re450-v2
+define Device/tplink_tl-re450-v2
   $(Device/tplink)
   ATH_SOC := qca9563
   IMAGE_SIZE := 6016k
@@ -27,59 +26,58 @@ define Device/tl-re450-v2
   IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
     append-metadata | check-size $$$$(IMAGE_SIZE)
   IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-  SUPPORTED_DEVICES := tplink,re450-v2
 endef
-TARGET_DEVICES += tl-re450-v2
+TARGET_DEVICES += tplink_tl-re450-v2
 
-define Device/tl-wdr3600
+define Device/tplink_tl-wdr3600
   $(Device/tplink-8mlzma)
   ATH_SOC := ar9344
   DEVICE_TITLE := TP-LINK TL-WDR3600
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x36000001
-  SUPPORTED_DEVICES := tplink,tl-wdr3600 tl-wdr3600
+  SUPPORTED_DEVICES += tl-wdr3600
 endef
-TARGET_DEVICES += tl-wdr3600
+TARGET_DEVICES += tplink_tl-wdr3600
 
-define Device/tl-wdr4300
-  $(Device/tl-wdr3600)
+define Device/tplink_tl-wdr4300
+  $(Device/tplink_tl-wdr3600)
   DEVICE_TITLE := TP-LINK TL-WDR4300
   TPLINK_HWID := 0x43000001
-  SUPPORTED_DEVICES := tplink,tl-wdr4300 tl-wdr4300
+  SUPPORTED_DEVICES += tl-wdr4300
 endef
-TARGET_DEVICES += tl-wdr4300
+TARGET_DEVICES += tplink_tl-wdr4300
 
-define Device/tl-wr1043nd-v1
+define Device/tplink_tl-wr1043nd-v1
   $(Device/tplink-8m)
   ATH_SOC := ar9132
   DEVICE_TITLE := TP-LINK TL-WR1043N/ND v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x10430001
-  SUPPORTED_DEVICES := tplink,tl-wr1043nd-v1 tl-wr1043nd
+  SUPPORTED_DEVICES += tl-wr1043nd
 endef
-TARGET_DEVICES += tl-wr1043nd-v1
+TARGET_DEVICES += tplink_tl-wr1043nd-v1
 
-define Device/tl-wr1043nd-v2
+define Device/tplink_tl-wr1043nd-v2
   $(Device/tplink-8mlzma)
   ATH_SOC := qca9558
   DEVICE_TITLE := TP-LINK TL-WR1043N/ND v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x10430002
-  SUPPORTED_DEVICES := tplink,tl-wr1043nd-v2 tl-wr1043nd-v2
+  SUPPORTED_DEVICES += tl-wr1043nd-v2
 endef
-TARGET_DEVICES += tl-wr1043nd-v2
+TARGET_DEVICES += tplink_tl-wr1043nd-v2
 
-define Device/tl-wr1043nd-v3
+define Device/tplink_tl-wr1043nd-v3
   $(Device/tplink-8mlzma)
   ATH_SOC := qca9558
   DEVICE_TITLE := TP-LINK TL-WR1043N/ND v3
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x10430003
-  SUPPORTED_DEVICES := tplink,tl-wr1043nd-v3 tl-wr1043nd-v3
+  SUPPORTED_DEVICES += tl-wr1043nd-v3
 endef
-TARGET_DEVICES += tl-wr1043nd-v3
+TARGET_DEVICES += tplink_tl-wr1043nd-v3
 
-define Device/tl-wr1043nd-v4
+define Device/tplink_tl-wr1043nd-v4
   $(Device/tplink)
   ATH_SOC := qca9563
   IMAGE_SIZE := 15552k
@@ -91,11 +89,11 @@ define Device/tl-wr1043nd-v4
   IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
     append-metadata | check-size $$$$(IMAGE_SIZE)
   IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-  SUPPORTED_DEVICES := tplink,tl-wr1043nd-v4 tl-wr1043nd-v4
+  SUPPORTED_DEVICES += tl-wr1043nd-v4
 endef
-TARGET_DEVICES += tl-wr1043nd-v4
+TARGET_DEVICES += tplink_tl-wr1043nd-v4
 
-define Device/tl-wr2543-v1
+define Device/tplink_tl-wr2543-v1
   $(Device/tplink-8mlzma)
   ATH_SOC := ar7242
   DEVICE_TITLE := TP-LINK TL-WR2543N/ND v1
@@ -104,6 +102,6 @@ define Device/tl-wr2543-v1
   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 := tplink,tl-wr2543-v1 tl-wr2543-v1
+  SUPPORTED_DEVICES += tl-wr2543-v1
 endef
-TARGET_DEVICES += tl-wr2543-v1
+TARGET_DEVICES += tplink_tl-wr2543-v1
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index a924fa90b0..f91f328417 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -18,18 +18,17 @@ define Device/embeddedwireless_dorin
   DEVICE_TITLE := Embedded Wireless Dorin
   DEVICE_PACKAGES := kmod-usb-chipidea2
   IMAGE_SIZE := 16000k
-  SUPPORTED_DEVICES += ew-dorin
 endef
 TARGET_DEVICES += embeddedwireless_dorin
 
-define Device/etactica-eg200
+define Device/etactica_eg200
   ATH_SOC := ar9331
   DEVICE_TITLE := eTactica EG200
   DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-ledtrig-oneshot \
 	kmod-usb-serial kmod-usb-serial-ftdi kmod-usb-storage  kmod-fs-ext4
-  SUPPORTED_DEVICES += etactica,eg200 rme-eg200
+  SUPPORTED_DEVICES += rme-eg200
 endef
-TARGET_DEVICES += etactica-eg200
+TARGET_DEVICES += etactica_eg200
 
 define Device/glinet_ar150
   ATH_SOC := ar9330
@@ -121,7 +120,7 @@ define Device/buffalo_wzr-hp-g450h
 endef
 TARGET_DEVICES += buffalo_wzr-hp-g450h
 
-define Device/phicomm-k2t
+define Device/phicomm_k2t
   ATH_SOC := qca9563
   DEVICE_TITLE := Phicomm K2T
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
@@ -131,6 +130,5 @@ define Device/phicomm-k2t
   IMAGE/default := append-kernel | append-rootfs | pad-rootfs
   IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
   DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k ath10k-firmware-qca9888
-  SUPPORTED_DEVICES += phicomm,k2t
 endef
-TARGET_DEVICES += phicomm-k2t
+TARGET_DEVICES += phicomm_k2t
diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk
index 48d14e9e2e..8782e4064f 100644
--- a/target/linux/ath79/image/tiny-netgear.mk
+++ b/target/linux/ath79/image/tiny-netgear.mk
@@ -18,10 +18,9 @@ define Device/netgear_wnr612-v2
 endef
 TARGET_DEVICES += netgear_wnr612-v2
 
-define Device/n150r
+define Device/on_n150r
   ATH_SOC := ar7240
   DEVICE_TITLE := ON Network N150R
-  DEVICE_DTS := ar7240_on_n150r
   NETGEAR_KERNEL_MAGIC := 0x32303631
   KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
@@ -31,6 +30,6 @@ define Device/n150r
   IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs
   IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
   IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE)
-  SUPPORTED_DEVICES := on,n150r n150r
+  SUPPORTED_DEVICES += n150r
 endef
-TARGET_DEVICES += n150r
+TARGET_DEVICES += on_n150r
diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk
index 6abc8365fb..44dd2700a5 100644
--- a/target/linux/ath79/image/tiny-tp-link.mk
+++ b/target/linux/ath79/image/tiny-tp-link.mk
@@ -1,97 +1,97 @@
 include ./common-tp-link.mk
 
 
-define Device/tl-mr10u
+define Device/tplink_tl-mr10u
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9331
   DEVICE_TITLE := TP-Link TL-MR10U
   DEVICE_PACKAGES := kmod-usb-chipidea2
   TPLINK_HWID := 0x00100101
-  SUPPORTED_DEVICES := tplink,tl-mr10u tl-mr10u
+  SUPPORTED_DEVICES += tl-mr10u
 endef
-TARGET_DEVICES += tl-mr10u
+TARGET_DEVICES += tplink_tl-mr10u
 
-define Device/tl-mr3020-v1
+define Device/tplink_tl-mr3020-v1
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9331
   DEVICE_TITLE := TP-LINK TL-MR3020 v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x30200001
-  SUPPORTED_DEVICES := tplink,tl-mr3020-v1 tl-mr3020-v1
+  SUPPORTED_DEVICES += tl-mr3020-v1
 endef
-TARGET_DEVICES += tl-mr3020-v1
+TARGET_DEVICES += tplink_tl-mr3020-v1
 
-define Device/tl-mr3220-v1
+define Device/tplink_tl-mr3220-v1
   $(Device/tplink-4m)
   ATH_SOC := ar7241
   DEVICE_TITLE := TP-Link TL-MR3220 v1
   TPLINK_HWID := 0x32200001
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES := tplink,tl-mr3220-v1 tl-mr3220-v1
+  SUPPORTED_DEVICES += tl-mr3220-v1
 endef
-TARGET_DEVICES += tl-mr3220-v1
+TARGET_DEVICES += tplink_tl-mr3220-v1
 
-define Device/tl-mr3420-v1
+define Device/tplink_tl-mr3420-v1
   $(Device/tplink-4m)
   ATH_SOC := ar7241
   DEVICE_TITLE := TP-Link TL-MR3420 v1
   TPLINK_HWID := 0x34200001
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES := tplink,tl-mr3420-v1 tl-mr3420-v1
+  SUPPORTED_DEVICES += tl-mr3420-v1
 endef
-TARGET_DEVICES += tl-mr3420-v1
+TARGET_DEVICES += tplink_tl-mr3420-v1
 
-define Device/tl-wr703n
+define Device/tplink_tl-wr703n
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9331
   DEVICE_TITLE := TP-Link TL-WR703N
   DEVICE_PACKAGES := kmod-usb-chipidea2
   TPLINK_HWID := 0x07030101
-  SUPPORTED_DEVICES := tplink,tl-wr703n tl-wr703n
+  SUPPORTED_DEVICES += tl-wr703n
 endef
-TARGET_DEVICES += tl-wr703n
+TARGET_DEVICES += tplink_tl-wr703n
 
-define Device/tl-wr740n-v2
+define Device/tplink_tl-wr740n-v2
   $(Device/tplink-4m)
   ATH_SOC := ar7240
   DEVICE_TITLE := TP-Link TL-WR740N/ND v2
   TPLINK_HWID := 0x07400001
-  SUPPORTED_DEVICES := tplink,tl-wr740n-v2 tl-wr740n-v2
+  SUPPORTED_DEVICES += tl-wr740n-v2
 endef
-TARGET_DEVICES += tl-wr740n-v2
+TARGET_DEVICES += tplink_tl-wr740n-v2
 
-define Device/tl-wr740nd-v4
+define Device/tplink_tl-wr740nd-v4
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9331
   DEVICE_TITLE := TP-LINK TL-WR740N/ND v4
   TPLINK_HWID := 0x07400004
-  SUPPORTED_DEVICES := tplink,tl-wr740n-v4 tl-wr740n-v4
+  SUPPORTED_DEVICES += tl-wr740n-v4
 endef
-TARGET_DEVICES += tl-wr740nd-v4
+TARGET_DEVICES += tplink_tl-wr740nd-v4
 
-define Device/tl-wr741nd-v4
+define Device/tplink_tl-wr741nd-v4
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9331
   DEVICE_TITLE := TP-LINK TL-WR741N/ND v4
   TPLINK_HWID := 0x07410004
-  SUPPORTED_DEVICES := tplink,tl-wr741n-v4 tl-wr741n-v4
+  SUPPORTED_DEVICES += tl-wr741n-v4
 endef
-TARGET_DEVICES += tl-wr741nd-v4
+TARGET_DEVICES += tplink_tl-wr741nd-v4
 
-define Device/tl-wr841-v7
+define Device/tplink_tl-wr841-v7
   $(Device/tplink-4m)
   ATH_SOC := ar7241
   DEVICE_TITLE := TP-LINK TL-WR841N/ND v7
   TPLINK_HWID := 0x08410007
-  SUPPORTED_DEVICES := tplink,tl-wr841-v7 tl-wr841-v7
+  SUPPORTED_DEVICES += tl-wr841-v7
 endef
-TARGET_DEVICES += tl-wr841-v7
+TARGET_DEVICES += tplink_tl-wr841-v7
 
-define Device/tl-wr841-v9
+define Device/tplink_tl-wr841-v9
   $(Device/tplink-4mlzma)
   ATH_SOC := qca9533
   DEVICE_TITLE := TP-LINK TL-WR841N/ND v9
   TPLINK_HWID := 0x08410009
-  SUPPORTED_DEVICES := tplink,tl-wr841n-v9 tl-wr841n-v9
+  SUPPORTED_DEVICES += tl-wr841n-v9
 endef
-TARGET_DEVICES += tl-wr841-v9
+TARGET_DEVICES += tplink_tl-wr841-v9