ramips: convert DEVICE_TITLE to new variables

Also unify naming and add details where they were missing.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

1 files changed, 199 insertions, 92 deletions

diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 077834edc8..a060717400 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -38,7 +38,8 @@ endef
 define Device/ai-br100
   DTS := AI-BR100
   IMAGE_SIZE := 7936k
-  DEVICE_TITLE := Aigale Ai-BR100
+  DEVICE_VENDOR := Aigale
+  DEVICE_MODEL := Ai-BR100
   DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ai-br100
@@ -46,7 +47,8 @@ TARGET_DEVICES += ai-br100
 define Device/alfa-network_ac1200rm
   DTS := AC1200RM
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := ALFA Network AC1200RM
+  DEVICE_VENDOR := ALFA Network
+  DEVICE_MODEL := AC1200RM
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci uboot-envtools
 endef
 TARGET_DEVICES += alfa-network_ac1200rm
@@ -54,7 +56,8 @@ TARGET_DEVICES += alfa-network_ac1200rm
 define Device/alfa-network_tube-e4g
   DTS := TUBE-E4G
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := ALFA Network Tube-E4G
+  DEVICE_VENDOR := ALFA Network
+  DEVICE_MODEL := Tube-E4G
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools uqmi \
 	-iwinfo -kmod-rt2800-soc -wpad-basic
 endef
@@ -70,6 +73,7 @@ define Device/amit_jboot
 endef
 
 define Device/Archer
+  DEVICE_VENDOR := TP-Link
   TPLINK_HWREVADD := 0
   TPLINK_HVERSION := 3
   KERNEL := $(KERNEL_DTB)
@@ -87,7 +91,7 @@ define Device/ArcherC20i
   TPLINK_HWREV := 58
   IMAGES += factory.bin
   DEVICE_PACKAGES := kmod-mt76x0e
-  DEVICE_TITLE := TP-Link ArcherC20i
+  DEVICE_MODEL := Archer C20i
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ArcherC20i
@@ -102,7 +106,8 @@ define Device/ArcherC50v1
   IMAGES += factory-us.bin factory-eu.bin
   IMAGE/factory-us.bin := tplink-v2-image -e -w 0
   IMAGE/factory-eu.bin := tplink-v2-image -e -w 2
-  DEVICE_TITLE := TP-Link ArcherC50v1
+  DEVICE_MODEL := Archer C50
+  DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ArcherC50v1
@@ -115,21 +120,23 @@ define Device/ArcherMR200
   TPLINK_HWID := 0xd7500001
   TPLINK_HWREV := 0x4a
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb-enablemodem
-  DEVICE_TITLE := TP-Link ArcherMR200
+  DEVICE_MODEL := Archer MR200
 endef
 TARGET_DEVICES += ArcherMR200
 
 define Device/bdcom_wap2100-sk
   DTS := BDCOM-WAP2100-SK
   IMAGE_SIZE := 15808k
-  DEVICE_TITLE := BDCOM WAP2100-SK (ZTE ZXECS EBG3130)
+  DEVICE_VENDOR := BDCOM
+  DEVICE_MODEL := WAP2100-SK (ZTE ZXECS EBG3130)
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76x2 kmod-mt76x0e kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += bdcom_wap2100-sk
 
 define Device/bocco
   DTS := BOCCO
-  DEVICE_TITLE := YUKAI Engineering BOCCO
+  DEVICE_VENDOR := YUKAI Engineering
+  DEVICE_MODEL := BOCCO
   DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
 endef
 TARGET_DEVICES += bocco
@@ -137,20 +144,23 @@ TARGET_DEVICES += bocco
 define Device/c108
   DTS := C108
   IMAGE_SIZE := 16777216
-  DEVICE_TITLE := HNET C108
+  DEVICE_VENDOR := HNET
+  DEVICE_MODEL := C108
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += c108
 
 define Device/cf-wr800n
   DTS := CF-WR800N
-  DEVICE_TITLE := Comfast CF-WR800N
+  DEVICE_VENDOR := Comfast
+  DEVICE_MODEL := CF-WR800N
 endef
 TARGET_DEVICES += cf-wr800n
 
 define Device/cs-qr10
   DTS := CS-QR10
-  DEVICE_TITLE := Planex CS-QR10
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := CS-QR10
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci \
 	kmod-sound-core kmod-sound-mt7620 \
 	kmod-i2c-ralink kmod-sdhci-mt7620
@@ -160,14 +170,16 @@ TARGET_DEVICES += cs-qr10
 define Device/d240
   DTS := D240
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Sanlinking Technologies D240
+  DEVICE_VENDOR := Sanlinking Technologies
+  DEVICE_MODEL := D240
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += d240
 
 define Device/db-wrt01
   DTS := DB-WRT01
-  DEVICE_TITLE := Planex DB-WRT01
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := DB-WRT01
 endef
 TARGET_DEVICES += db-wrt01
 
@@ -177,7 +189,8 @@ define Device/dch-m225
   BLOCKSIZE := 4k
   SEAMA_SIGNATURE := wapn22_dlink.2013gui_dap1320b
   IMAGE_SIZE := 6848k
-  DEVICE_TITLE := D-Link DCH-M225
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DCH-M225
   DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
 endef
 TARGET_DEVICES += dch-m225
@@ -185,7 +198,8 @@ TARGET_DEVICES += dch-m225
 define Device/dir-810l
   DTS := DIR-810L
   DEVICE_PACKAGES := kmod-mt76x0e
-  DEVICE_TITLE := D-Link DIR-810L
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-810L
   IMAGE_SIZE := 6720k
 endef
 TARGET_DEVICES += dir-810l
@@ -193,7 +207,8 @@ TARGET_DEVICES += dir-810l
 define Device/dlink_dir-510l
   $(Device/amit_jboot)
   DTS := DIR-510L
-  DEVICE_TITLE := D-Link DIR-510L
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-510L
   DEVICE_PACKAGES += kmod-mt76x0e
   DLINK_ROM_ID := DLK6E3805001
   DLINK_FAMILY_MEMBER := 0x6E38
@@ -205,7 +220,9 @@ TARGET_DEVICES += dlink_dir-510l
 define Device/dlink_dwr-116-a1
   $(Device/amit_jboot)
   DTS := DWR-116-A1
-  DEVICE_TITLE := D-Link DWR-116 A1/A2
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-116
+  DEVICE_VARIANT := A1/A2
   DLINK_ROM_ID := DLK6E3803001
   DLINK_FAMILY_MEMBER := 0x6E38
   DLINK_FIRMWARE_SIZE := 0x7E0000
@@ -215,7 +232,9 @@ TARGET_DEVICES += dlink_dwr-116-a1
 define Device/dlink_dwr-118-a1
   $(Device/amit_jboot)
   DTS := DWR-118-A1
-  DEVICE_TITLE := D-Link DWR-118 A1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-118
+  DEVICE_VARIANT := A1
   DEVICE_PACKAGES += kmod-mt76x0e
   DLINK_ROM_ID := DLK6E3811001
   DLINK_FAMILY_MEMBER := 0x6E38
@@ -226,7 +245,9 @@ TARGET_DEVICES += dlink_dwr-118-a1
 define Device/dlink_dwr-118-a2
   $(Device/amit_jboot)
   DTS := DWR-118-A2
-  DEVICE_TITLE := D-Link DWR-118 A2
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-118
+  DEVICE_VARIANT := A2
   DEVICE_PACKAGES += kmod-mt76x2
   DLINK_ROM_ID := DLK6E3814001
   DLINK_FAMILY_MEMBER := 0x6E38
@@ -238,7 +259,9 @@ define Device/dlink_dwr-921-c1
   $(Device/amit_jboot)
   DTS := DWR-921-C1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := D-Link DWR-921 C1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-921
+  DEVICE_VARIANT := C1
   DLINK_ROM_ID := DLK6E2414001
   DLINK_FAMILY_MEMBER := 0x6E24
   DLINK_FIRMWARE_SIZE := 0xFE0000
@@ -248,7 +271,9 @@ TARGET_DEVICES += dlink_dwr-921-c1
 
 define Device/dlink_dwr-921-c3
   $(Device/dlink_dwr-921-c1)
-  DEVICE_TITLE := D-Link DWR-921 C3
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-921
+  DEVICE_VARIANT := C3
   DLINK_ROM_ID := DLK6E2414009
   SUPPORTED_DEVICES := dlink,dwr-921-c1
 endef
@@ -258,7 +283,9 @@ define Device/dlink_dwr-922-e2
   $(Device/amit_jboot)
   DTS := DWR-922-E2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := D-Link DWR-922 E2
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-922
+  DEVICE_VARIANT := E2
   DLINK_ROM_ID := DLK6E2414005
   DLINK_FAMILY_MEMBER := 0x6E24
   DLINK_FIRMWARE_SIZE := 0xFE0000
@@ -271,7 +298,8 @@ define Device/e1700
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	umedia-header 0x013326
-  DEVICE_TITLE := Linksys E1700
+  DEVICE_VENDOR := Linksys
+  DEVICE_MODEL := E1700
 endef
 TARGET_DEVICES += e1700
 
@@ -285,7 +313,8 @@ define Device/ex2700
   KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	netgear-dni
-  DEVICE_TITLE := Netgear EX2700
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := EX2700
 endef
 TARGET_DEVICES += ex2700
 
@@ -297,7 +326,8 @@ define Device/ex3700-ex3800
   IMAGES += factory.chk
   IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk
   DEVICE_PACKAGES := kmod-mt76x2
-  DEVICE_TITLE := Netgear EX3700/EX3800
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := EX3700/EX3800
   SUPPORTED_DEVICES := ex3700
 endef
 TARGET_DEVICES += ex3700-ex3800
@@ -305,7 +335,8 @@ TARGET_DEVICES += ex3700-ex3800
 define Device/gl-mt300a
   DTS := GL-MT300A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := GL-Inet GL-MT300A
+  DEVICE_VENDOR := GL.iNet
+  DEVICE_MODEL := GL-MT300A
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += gl-mt300a
@@ -313,7 +344,9 @@ TARGET_DEVICES += gl-mt300a
 define Device/u25awf-h1
   DTS := U25AWF-H1
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Kimax U25AWF-H1
+  DEVICE_VENDOR := Kimax
+  DEVICE_MODEL := U25AWF
+  DEVICE_VARIANT := H1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += u25awf-h1
@@ -321,7 +354,8 @@ TARGET_DEVICES += u25awf-h1
 define Device/gl-mt300n
   DTS := GL-MT300N
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := GL-Inet GL-MT300N
+  DEVICE_VENDOR := GL.iNet
+  DEVICE_MODEL := GL-MT300N
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += gl-mt300n
@@ -329,7 +363,8 @@ TARGET_DEVICES += gl-mt300n
 define Device/gl-mt750
   DTS := GL-MT750
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := GL-Inet GL-MT750
+  DEVICE_VENDOR := GL.iNet
+  DEVICE_MODEL := GL-MT750
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += gl-mt750
@@ -337,7 +372,8 @@ TARGET_DEVICES += gl-mt750
 define Device/hc5661
   DTS := HC5661
   IMAGE_SIZE := 15872k
-  DEVICE_TITLE := HiWiFi HC5661
+  DEVICE_VENDOR := HiWiFi
+  DEVICE_MODEL := HC5661
   DEVICE_PACKAGES := kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += hc5661
@@ -345,7 +381,8 @@ TARGET_DEVICES += hc5661
 define Device/hc5761
   DTS := HC5761
   IMAGE_SIZE := 15872k
-  DEVICE_TITLE := HiWiFi HC5761
+  DEVICE_VENDOR := HiWiFi
+  DEVICE_MODEL := HC5761
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hc5761
@@ -353,7 +390,8 @@ TARGET_DEVICES += hc5761
 define Device/hc5861
   DTS := HC5861
   IMAGE_SIZE := 15872k
-  DEVICE_TITLE := HiWiFi HC5861
+  DEVICE_VENDOR := HiWiFi
+  DEVICE_MODEL := HC5861
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hc5861
@@ -361,7 +399,8 @@ TARGET_DEVICES += hc5861
 define Device/head-weblink_hdrm200
   DTS := HDRM200
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Head Weblink HDRM2000
+  DEVICE_VENDOR := Head Weblink
+  DEVICE_MODEL := HDRM2000
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \
 		     uqmi kmod-usb-serial kmod-usb-serial-option
 endef
@@ -369,7 +408,8 @@ TARGET_DEVICES += head-weblink_hdrm200
 
 define Device/iodata_wn-ac1167gr
   DTS := WN-AC1167GR
-  DEVICE_TITLE := I-O DATA WN-AC1167GR
+  DEVICE_VENDOR := I-O DATA
+  DEVICE_MODEL := WN-AC1167GR
   IMAGE_SIZE := 6864k
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -381,7 +421,8 @@ TARGET_DEVICES += iodata_wn-ac1167gr
 
 define Device/iodata_wn-ac733gr3
   DTS := WN-AC733GR3
-  DEVICE_TITLE := I-O DATA WN-AC733GR3
+  DEVICE_VENDOR := I-O DATA
+  DEVICE_MODEL := WN-AC733GR3
   IMAGE_SIZE := 6992k
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -394,7 +435,8 @@ TARGET_DEVICES += iodata_wn-ac733gr3
 define Device/kimax_u35wf
   DTS := U35WF
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Kimax U35WF
+  DEVICE_VENDOR := Kimax
+  DEVICE_MODEL := U35WF
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += kimax_u35wf
@@ -402,7 +444,8 @@ TARGET_DEVICES += kimax_u35wf
 define Device/kng_rc
   DTS := kng_rc
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := ZyXEL Keenetic Viva
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Viva
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
@@ -413,7 +456,8 @@ TARGET_DEVICES += kng_rc
 
 define Device/kn_rc
   DTS := kn_rc
-  DEVICE_TITLE := ZyXEL Keenetic Omni
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Omni
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
@@ -424,7 +468,8 @@ TARGET_DEVICES += kn_rc
 
 define Device/kn_rf
   DTS := kn_rf
-  DEVICE_TITLE := ZyXEL Keenetic Omni II
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Omni II
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
@@ -436,7 +481,8 @@ TARGET_DEVICES += kn_rf
 define Device/microwrt
   DTS := MicroWRT
   IMAGE_SIZE := 16128k
-  DEVICE_TITLE := Microduino MicroWRT
+  DEVICE_VENDOR := Microduino
+  DEVICE_MODEL := MicroWRT
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += microwrt
@@ -444,7 +490,8 @@ TARGET_DEVICES += microwrt
 define Device/lava_lr-25g001
   $(Device/amit_jboot)
   DTS := LR-25G001
-  DEVICE_TITLE := LAVA LR-25G001
+  DEVICE_VENDOR := LAVA
+  DEVICE_MODEL := LR-25G001
   DLINK_ROM_ID := LVA6E3804001
   DLINK_FAMILY_MEMBER := 0x6E38
   DLINK_FIRMWARE_SIZE := 0xFE0000
@@ -455,7 +502,8 @@ TARGET_DEVICES += lava_lr-25g001
 define Device/miwifi-mini
   DTS := MIWIFI-MINI
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Xiaomi MiWiFi Mini
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := MiWiFi Mini
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += miwifi-mini
@@ -463,7 +511,8 @@ TARGET_DEVICES += miwifi-mini
 define Device/mlw221
   DTS := MLW221
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Kingston MLW221
+  DEVICE_VENDOR := Kingston
+  DEVICE_MODEL := MLW221
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += mlw221
@@ -471,27 +520,31 @@ TARGET_DEVICES += mlw221
 define Device/mlwg2
   DTS := MLWG2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Kingston MLWG2
+  DEVICE_VENDOR := Kingston
+  DEVICE_MODEL := MLWG2
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += mlwg2
 
 define Device/mt7620a
   DTS := MT7620a
-  DEVICE_TITLE := MediaTek MT7620a EVB
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a EVB
 endef
 TARGET_DEVICES += mt7620a
 
 define Device/mt7620a_mt7530
   DTS := MT7620a_MT7530
-  DEVICE_TITLE := MediaTek MT7620a + MT7530 EVB
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a + MT7530 EVB
   SUPPORTED_DEVICES := mt7620a_mt7530
 endef
 TARGET_DEVICES += mt7620a_mt7530
 
 define Device/mt7620a_mt7610e
   DTS := MT7620a_MT7610e
-  DEVICE_TITLE := MediaTek MT7620a + MT7610e EVB
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a + MT7610e EVB
   DEVICE_PACKAGES := kmod-mt76x0e
   SUPPORTED_DEVICES := mt7620a_mt7610e
 endef
@@ -499,27 +552,31 @@ TARGET_DEVICES += mt7620a_mt7610e
 
 define Device/mt7620a_v22sg
   DTS := MT7620a_V22SG
-  DEVICE_TITLE := MediaTek MT7620a V22SG
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a V22SG
   SUPPORTED_DEVICES := mt7620a_v22sg
 endef
 TARGET_DEVICES += mt7620a_v22sg
 
 define Device/mzk-750dhp
   DTS := MZK-750DHP
-  DEVICE_TITLE := Planex MZK-750DHP
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-750DHP
   DEVICE_PACKAGES := kmod-mt76x0e
 endef
 TARGET_DEVICES += mzk-750dhp
 
 define Device/mzk-ex300np
   DTS := MZK-EX300NP
-  DEVICE_TITLE := Planex MZK-EX300NP
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-EX300NP
 endef
 TARGET_DEVICES += mzk-ex300np
 
 define Device/mzk-ex750np
   DTS := MZK-EX750NP
-  DEVICE_TITLE := Planex MZK-EX750NP
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-EX750NP
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += mzk-ex750np
@@ -527,7 +584,8 @@ TARGET_DEVICES += mzk-ex750np
 define Device/na930
   DTS := NA930
   IMAGE_SIZE := 20m
-  DEVICE_TITLE := Sercomm NA930
+  DEVICE_VENDOR := Sercomm
+  DEVICE_MODEL := NA930
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += na930
@@ -535,21 +593,25 @@ TARGET_DEVICES += na930
 define Device/oy-0001
   DTS := OY-0001
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Oh Yeah OY-0001
+  DEVICE_VENDOR := Oh Yeah
+  DEVICE_MODEL := OY-0001
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += oy-0001
 
 define Device/psg1208
   DTS := PSG1208
-  DEVICE_TITLE := Phicomm PSG1208
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := PSG1208
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += psg1208
 
 define Device/psg1218a
   DTS := PSG1218A
-  DEVICE_TITLE := Phicomm PSG1218 rev.Ax
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := PSG1218
+  DEVICE_VARIANT:= Ax
   DEVICE_PACKAGES := kmod-mt76x2
   SUPPORTED_DEVICES += psg1218
 endef
@@ -557,7 +619,9 @@ TARGET_DEVICES += psg1218a
 
 define Device/psg1218b
   DTS := PSG1218B
-  DEVICE_TITLE := Phicomm PSG1218 rev.Bx
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := PSG1218
+  DEVICE_VARIANT := Bx
   DEVICE_PACKAGES := kmod-mt76x2
   SUPPORTED_DEVICES += psg1218
 endef
@@ -566,27 +630,31 @@ TARGET_DEVICES += psg1218b
 define Device/phicomm_k2g
   DTS := K2G
   IMAGE_SIZE := 7552k
-  DEVICE_TITLE := Phicomm K2G
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := K2G
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += phicomm_k2g
 
 define Device/rp-n53
   DTS := RP-N53
-  DEVICE_TITLE := Asus RP-N53
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RP-N53
   DEVICE_PACKAGES := kmod-rt2800-pci
 endef
 TARGET_DEVICES += rp-n53
 
 define Device/rt-n12p
   DTS := RT-N12-PLUS
-  DEVICE_TITLE := Asus RT-N11P/RT-N12+/RT-N12Eb1
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1
 endef
 TARGET_DEVICES += rt-n12p
 
 define Device/rt-n14u
   DTS := RT-N14U
-  DEVICE_TITLE := Asus RT-N14u
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N14u
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += rt-n14u
@@ -594,21 +662,25 @@ TARGET_DEVICES += rt-n14u
 define Device/rt-ac51u
   DTS := RT-AC51U
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Asus RT-AC51U
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-AC51U
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += rt-ac51u
 
 define Device/tiny-ac
   DTS := TINY-AC
-  DEVICE_TITLE := Dovado Tiny AC
+  DEVICE_VENDOR := Dovado
+  DEVICE_MODEL := Tiny AC
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += tiny-ac
 
 define Device/edimax_br-6478ac-v2
   DTS := BR-6478AC-V2
-  DEVICE_TITLE := Edimax BR-6478AC V2
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := BR-6478AC
+  DEVICE_VARIANT := V2
   BLOCKSIZE := 64k
   IMAGE_SIZE := 7616k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -620,7 +692,8 @@ TARGET_DEVICES += edimax_br-6478ac-v2
 
 define Device/edimax_ew-7476rpc
   DTS := EW-7476RPC
-  DEVICE_TITLE := Edimax EW-7476RPC
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := EW-7476RPC
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7744k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -632,7 +705,8 @@ TARGET_DEVICES += edimax_ew-7476rpc
 
 define Device/edimax_ew-7478ac
   DTS := EW-7478AC
-  DEVICE_TITLE := Edimax EW-7478AC
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := EW-7478AC
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7744k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -644,7 +718,8 @@ TARGET_DEVICES += edimax_ew-7478ac
 
 define Device/edimax_ew-7478apc
   DTS := EW-7478APC
-  DEVICE_TITLE := Edimax EW-7478APC
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := EW-7478APC
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7744k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -661,7 +736,8 @@ define Device/tplink_c2-v1
   TPLINK_HWID := 0xc7500001
   TPLINK_HWREV := 50
   IMAGES += factory.bin
-  DEVICE_TITLE := TP-Link Archer C2 v1
+  DEVICE_MODEL := Archer C2
+  DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
 endef
 TARGET_DEVICES += tplink_c2-v1
@@ -674,7 +750,8 @@ define Device/tplink_c20-v1
   TPLINK_HWREV := 0x44
   TPLINK_HWREVADD := 0x1
   IMAGES += factory.bin
-  DEVICE_TITLE := TP-Link ArcherC20 v1
+  DEVICE_MODEL := Archer C20
+  DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += tplink_c20-v1
@@ -683,14 +760,16 @@ define Device/vonets_var11n-300
   DTS := VAR11N-300
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   BLOCKSIZE := 4k
-  DEVICE_TITLE := Vonets VAR11N-300
+  DEVICE_VENDOR := Vonets
+  DEVICE_MODEL := VAR11N-300
 endef
 TARGET_DEVICES += vonets_var11n-300
 
 define Device/ravpower_wd03
   DTS := WD03
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_TITLE := Ravpower WD03
+  DEVICE_VENDOR := Ravpower
+  DEVICE_MODEL := WD03
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ravpower_wd03
@@ -698,7 +777,8 @@ TARGET_DEVICES += ravpower_wd03
 define Device/whr-1166d
   DTS := WHR-1166D
   IMAGE_SIZE := 15040k
-  DEVICE_TITLE := Buffalo WHR-1166D
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-1166D
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += whr-1166d
@@ -706,21 +786,24 @@ TARGET_DEVICES += whr-1166d
 define Device/whr-300hp2
   DTS := WHR-300HP2
   IMAGE_SIZE := 6848k
-  DEVICE_TITLE := Buffalo WHR-300HP2
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-300HP2
 endef
 TARGET_DEVICES += whr-300hp2
 
 define Device/whr-600d
   DTS := WHR-600D
   IMAGE_SIZE := 6848k
-  DEVICE_TITLE := Buffalo WHR-600D
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-600D
   DEVICE_PACKAGES := kmod-rt2800-pci
 endef
 TARGET_DEVICES += whr-600d
 
 define Device/wmr-300
   DTS := WMR-300
-  DEVICE_TITLE := Buffalo WMR-300
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WMR-300
 endef
 TARGET_DEVICES += wmr-300
 
@@ -733,7 +816,9 @@ define Device/wn3000rpv3
   KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	netgear-dni
-  DEVICE_TITLE := Netgear WN3000RPv3
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WN3000RP
+  DEVICE_VARIANT := v3
 endef
 TARGET_DEVICES += wn3000rpv3
 
@@ -743,7 +828,8 @@ define Device/wrh-300cr
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	elecom-header
-  DEVICE_TITLE := Elecom WRH-300CR
+  DEVICE_VENDOR := Elecom
+  DEVICE_MODEL := WRH-300CR
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += wrh-300cr
@@ -751,7 +837,8 @@ TARGET_DEVICES += wrh-300cr
 define Device/wrtnode
   DTS := WRTNODE
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := WRTNode
+  DEVICE_VENDOR := 
+  DEVICE_MODEL := WRTNode
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += wrtnode
@@ -764,7 +851,9 @@ define Device/wt3020-4M
   SUPPORTED_DEVICES += wt3020
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	poray-header -B WT3020 -F 4M
-  DEVICE_TITLE := Nexx WT3020 (4MB)
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT3020
+  DEVICE_VARIANT := 4M
 endef
 TARGET_DEVICES += wt3020-4M
 
@@ -774,7 +863,9 @@ define Device/wt3020-8M
   SUPPORTED_DEVICES += wt3020
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	poray-header -B WT3020 -F 8M
-  DEVICE_TITLE := Nexx WT3020 (8MB)
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT3020
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += wt3020-8M
@@ -782,7 +873,8 @@ TARGET_DEVICES += wt3020-8M
 define Device/y1
   DTS := Y1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Lenovo Y1
+  DEVICE_VENDOR := Lenovo
+  DEVICE_MODEL := Y1
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += y1
@@ -790,7 +882,8 @@ TARGET_DEVICES += y1
 define Device/y1s
   DTS := Y1S
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Lenovo Y1S
+  DEVICE_VENDOR := Lenovo
+  DEVICE_MODEL := Y1S
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += y1s
@@ -798,7 +891,8 @@ TARGET_DEVICES += y1s
 define Device/youku-yk1
   DTS := YOUKU-YK1
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := YOUKU YK1
+  DEVICE_VENDOR := YOUKU
+  DEVICE_MODEL := YK1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += youku-yk1
@@ -807,35 +901,41 @@ define Device/we1026-5g-16m
   DTS := WE1026-5G-16M
   IMAGE_SIZE := 16777216
   SUPPORTED_DEVICES += we1026-5g-16m
-  DEVICE_TITLE := Zbtlink ZBT-WE1026-5G (16M)
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE1026-5G
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += we1026-5g-16m
 
 define Device/zbt-ape522ii
   DTS := ZBT-APE522II
-  DEVICE_TITLE := Zbtlink ZBT-APE522II
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-APE522II
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += zbt-ape522ii
 
 define Device/zbt-cpe102
   DTS := ZBT-CPE102
-  DEVICE_TITLE := Zbtlink ZBT-CPE102
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-CPE102
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zbt-cpe102
 
 define Device/zbt-wa05
   DTS := ZBT-WA05
-  DEVICE_TITLE := Zbtlink ZBT-WA05
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WA05
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zbt-wa05
 
 define Device/zbt-we2026
   DTS := ZBT-WE2026
-  DEVICE_TITLE := Zbtlink ZBT-WE2026
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE2026
 endef
 TARGET_DEVICES += zbt-we2026
 
@@ -843,7 +943,9 @@ define Device/zbt-we826-16M
   DTS := ZBT-WE826-16M
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   SUPPORTED_DEVICES += zbt-we826
-  DEVICE_TITLE := Zbtlink ZBT-WE826 (16M)
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE826
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += zbt-we826-16M
@@ -851,7 +953,9 @@ TARGET_DEVICES += zbt-we826-16M
 define Device/zbt-we826-32M
   DTS := ZBT-WE826-32M
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := Zbtlink ZBT-WE826 (32M)
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE826
+  DEVICE_VARIANT := 32M
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += zbt-we826-32M
@@ -859,7 +963,8 @@ TARGET_DEVICES += zbt-we826-32M
 define Device/zbtlink_zbt-we826-e
   DTS := ZBT-WE826-E
   IMAGE_SIZE := 32448k
-  DEVICE_TITLE := Zbtlink ZBT-WE826-E
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE826-E
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 uqmi \
 		     kmod-usb-serial kmod-usb-serial-option
 endef
@@ -867,14 +972,16 @@ TARGET_DEVICES += zbtlink_zbt-we826-e
 
 define Device/zbt-wr8305rt
   DTS := ZBT-WR8305RT
-  DEVICE_TITLE := Zbtlink ZBT-WR8305RT
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WR8305RT
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zbt-wr8305rt
 
 define Device/zte-q7
   DTS := ZTE-Q7
-  DEVICE_TITLE := ZTE Q7
+  DEVICE_VENDOR := ZTE
+  DEVICE_MODEL := Q7
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zte-q7