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, 239 insertions, 105 deletions

diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index adda8ec67e..c1184b0182 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -27,7 +27,8 @@ define Device/3g150b
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := Tenda 3G150B
+  DEVICE_VENDOR := Tenda
+  DEVICE_MODEL := 3G150B
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += 3g150b
@@ -36,7 +37,8 @@ define Device/3g300m
   DTS := 3G300M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME := 3G150M_SPI Kernel Image
-  DEVICE_TITLE := Tenda 3G300M
+  DEVICE_VENDOR := Tenda
+  DEVICE_MODEL := 3G300M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += 3g300m
@@ -47,7 +49,8 @@ define Device/3g-6200n
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
 	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := Edimax 3g-6200n
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := 3g-6200n
 endef
 TARGET_DEVICES += 3g-6200n
 
@@ -57,7 +60,8 @@ define Device/3g-6200nl
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
 	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := Edimax 3g-6200nl
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := 3g-6200nl
 endef
 TARGET_DEVICES += 3g-6200nl
 
@@ -67,7 +71,8 @@ define Device/a5-v11
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B A5-V11 -F 4M
-  DEVICE_TITLE := A5-V11
+  DEVICE_VENDOR := 
+  DEVICE_MODEL := A5-V11
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
 endef
 TARGET_DEVICES += a5-v11
@@ -76,21 +81,26 @@ define Device/air3gii
   DTS := AIR3GII
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := AirLive Air3GII
+  DEVICE_VENDOR := AirLive
+  DEVICE_MODEL := Air3GII
 endef
 TARGET_DEVICES += air3gii
 
 define Device/all0256n-4M
   DTS := ALL0256N-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Allnet ALL0256N (4MB)
+  DEVICE_VENDOR := Allnet
+  DEVICE_MODEL := ALL0256N
+  DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := rssileds
 endef
 TARGET_DEVICES += all0256n-4M
 
 define Device/all0256n-8M
   DTS := ALL0256N-8M
-  DEVICE_TITLE := Allnet ALL0256N (8MB)
+  DEVICE_VENDOR := Allnet
+  DEVICE_MODEL := ALL0256N
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := rssileds
 endef
 TARGET_DEVICES += all0256n-8M
@@ -98,7 +108,8 @@ TARGET_DEVICES += all0256n-8M
 define Device/all5002
   DTS := ALL5002
   IMAGE_SIZE := 32448k
-  DEVICE_TITLE := Allnet ALL5002
+  DEVICE_VENDOR := Allnet
+  DEVICE_MODEL := ALL5002
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
           kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x
 endef
@@ -107,7 +118,8 @@ TARGET_DEVICES += all5002
 define Device/all5003
   DTS := ALL5003
   IMAGE_SIZE := 32448k
-  DEVICE_TITLE := Allnet ALL5003
+  DEVICE_VENDOR := Allnet
+  DEVICE_MODEL := ALL5003
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
           kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x
 endef
@@ -117,7 +129,8 @@ define Device/asl26555-8M
   DTS := ASL26555-8M
   IMAGE_SIZE := 7744k
   SUPPORTED_DEVICES += asl26555
-  DEVICE_TITLE := Alpha ASL26555 
+  DEVICE_VENDOR := Alpha
+  DEVICE_MODEL := ASL26555
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += asl26555-8M
@@ -126,7 +139,9 @@ define Device/asl26555-16M
   DTS := ASL26555-16M
   IMAGE_SIZE := 15872k
   SUPPORTED_DEVICES += asl26555
-  DEVICE_TITLE := Alpha ASL26555 16M
+  DEVICE_VENDOR := Alpha
+  DEVICE_MODEL := ASL26555
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += asl26555-16M
@@ -134,14 +149,17 @@ TARGET_DEVICES += asl26555-16M
 define Device/atp-52b
   DTS := ATP-52B
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := Argus ATP-52B
+  DEVICE_VENDOR := Argus
+  DEVICE_MODEL := ATP-52B
 endef
 TARGET_DEVICES += atp-52b
 
 define Device/awm002-evb-4M
   DTS := AWM002-EVB-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := AsiaRF AWM002-EVB (4M)
+  DEVICE_VENDOR := AsiaRF
+  DEVICE_MODEL := AWM002-EVB
+  DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-gpio
 endef
@@ -149,7 +167,9 @@ TARGET_DEVICES += awm002-evb-4M
 
 define Device/awm002-evb-8M
   DTS := AWM002-EVB-8M
-  DEVICE_TITLE := AsiaRF AWM002-EVB (8M)/AsiaRF AWM003 EVB
+  DEVICE_VENDOR := AsiaRF
+  DEVICE_MODEL := AWM002-EVB/AWM003-EVB
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-gpio
 endef
@@ -159,13 +179,15 @@ define Device/awapn2403
   DTS := AWAPN2403
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := AsiaRF AWAPN2403
+  DEVICE_VENDOR := AsiaRF
+  DEVICE_MODEL := AWAPN2403
 endef
 TARGET_DEVICES += awapn2403
 
 define Device/bc2
   DTS := BC2
-  DEVICE_TITLE := NexAira BC2
+  DEVICE_VENDOR := NexAira
+  DEVICE_MODEL := BC2
 endef
 TARGET_DEVICES += bc2
 
@@ -173,14 +195,16 @@ define Device/broadway
   DTS := BROADWAY
   IMAGE_SIZE := 7744k
   UIMAGE_NAME:= Broadway Kernel Image
-  DEVICE_TITLE := Hauppauge Broadway
+  DEVICE_VENDOR := Hauppauge
+  DEVICE_MODEL := Broadway
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += broadway
 
 define Device/carambola
   DTS := CARAMBOLA
-  DEVICE_TITLE := 8devices Carambola
+  DEVICE_VENDOR := 8devices 
+  DEVICE_MODEL := Carambola
   DEVICE_PACKAGES :=
 endef
 TARGET_DEVICES += carambola
@@ -189,7 +213,8 @@ define Device/d105
   DTS := D105
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Huawei D105
+  DEVICE_VENDOR := Huawei
+  DEVICE_MODEL := D105
 endef
 TARGET_DEVICES += d105
 
@@ -201,14 +226,16 @@ define Device/dap-1350
 	dap-header -s RT3052-AP-DAP1350WW-3
   IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	dap-header -s RT3052-AP-DAP1350-3
-  DEVICE_TITLE := D-Link DAP-1350
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DAP-1350
 endef
 TARGET_DEVICES += dap-1350
 
 define Device/dcs-930
   DTS := DCS-930
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DCS-930
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DCS-930
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-dwc2
 endef
 TARGET_DEVICES += dcs-930
@@ -216,7 +243,9 @@ TARGET_DEVICES += dcs-930
 define Device/dcs-930l-b1
   DTS := DCS-930L-B1
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DCS-930L B1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DCS-930L
+  DEVICE_VARIANT := B1
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-ohci kmod-usb2
 endef
 TARGET_DEVICES += dcs-930l-b1
@@ -227,7 +256,9 @@ define Device/dir-300-b1
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir300b
-  DEVICE_TITLE := D-Link DIR-300 B1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-300
+  DEVICE_VARIANT := B1
 endef
 TARGET_DEVICES += dir-300-b1
 
@@ -235,13 +266,17 @@ define Device/dir-300-b7
   DTS := DIR-300-B7
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DIR-300 B7
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-300
+  DEVICE_VARIANT := B7
 endef
 TARGET_DEVICES += dir-300-b7
 
 define Device/dir-320-b1
   DTS := DIR-320-B1
-  DEVICE_TITLE := D-Link DIR-320 B1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-320
+  DEVICE_VARIANT := B1
 endef
 TARGET_DEVICES += dir-320-b1
 
@@ -252,7 +287,9 @@ define Device/dir-600-b1
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir600b
-  DEVICE_TITLE := D-Link DIR-600 B1/B2
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-600
+  DEVICE_VARIANT := B1/B2
 endef
 TARGET_DEVICES += dir-600-b1
 
@@ -263,7 +300,9 @@ define Device/dir-610-a1
   SEAMA_SIGNATURE := wrgn59_dlob.hans_dir610
   KERNEL := $(KERNEL_DTB)
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DIR-610 A1 
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-610
+  DEVICE_VARIANT := A1
   DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer
 endef
 TARGET_DEVICES += dir-610-a1
@@ -274,7 +313,9 @@ define Device/dir-615-d
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir615d
-  DEVICE_TITLE := D-Link DIR-615 D
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-615
+  DEVICE_VARIANT := D
 endef
 TARGET_DEVICES += dir-615-d
 
@@ -286,26 +327,33 @@ define Device/dir-615-h1
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | senao-header -r 0x218 -p 0x30 -t 3
-  DEVICE_TITLE := D-Link DIR-615 H1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-615
+  DEVICE_VARIANT := H1
 endef
 TARGET_DEVICES += dir-615-h1
 
 define Device/dir-620-a1
   DTS := DIR-620-A1
-  DEVICE_TITLE := D-Link DIR-620 A1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-620 A1
 endef
 TARGET_DEVICES += dir-620-a1
 
 define Device/dir-620-d1
   DTS := DIR-620-D1
-  DEVICE_TITLE := D-Link DIR-620 D1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-620
+  DEVICE_VARIANT := D1
 endef
 TARGET_DEVICES += dir-620-d1
 
 define Device/dwr-512-b
   DTS := DWR-512-B
   IMAGE_SIZE := 7800k
-  DEVICE_TITLE := D-Link DWR-512 B
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-512
+  DEVICE_VARIANT := B
   DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-spi-dev kmod-usb-serial \
 			kmod-usb-serial-option kmod-usb-net kmod-usb-net-cdc-ether \
 			comgt-ncm
@@ -323,14 +371,17 @@ define Device/esr-9753
   DTS := ESR-9753
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := EnGenius ESR-9753
+  DEVICE_VENDOR := EnGenius
+  DEVICE_MODEL := ESR-9753
 endef
 TARGET_DEVICES += esr-9753
 
 define Device/f5d8235-v2
   DTS := F5D8235_V2
   IMAGE_SIZE := 7744k
-  DEVICE_TITLE := Belkin F5D8235 v2
+  DEVICE_VENDOR := Belkin
+  DEVICE_MODEL := F5D8235
+  DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-switch-rtl8366rb
 endef
 TARGET_DEVICES += f5d8235-v2
@@ -338,7 +389,8 @@ TARGET_DEVICES += f5d8235-v2
 define Device/f7c027
   DTS := F7C027
   IMAGE_SIZE := 7616k
-  DEVICE_TITLE := Belkin F7C027
+  DEVICE_VENDOR := Belkin
+  DEVICE_MODEL := F7C027
   DEVICE_PACKAGES := -kmod-usb-core -kmod-usb-dwc2 -kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += f7c027
@@ -348,14 +400,16 @@ define Device/fonera20n
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | \
 	edimax-header -s RSDK -m NL1T -f 0x50000 -S 0xc0000
-  DEVICE_TITLE := Fonera 2.0N
+  DEVICE_VENDOR := Fon
+  DEVICE_MODEL := Fonera 2.0N
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += fonera20n
 
 define Device/freestation5
   DTS := FREESTATION5
-  DEVICE_TITLE := ARC Wireless FreeStation
+  DEVICE_VENDOR := ARC Wireless
+  DEVICE_MODEL := FreeStation
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb kmod-rt2x00-usb
 endef
 TARGET_DEVICES += freestation5
@@ -363,7 +417,8 @@ TARGET_DEVICES += freestation5
 define Device/hg255d
   DTS := HG255D
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := HuaWei HG255D
+  DEVICE_VENDOR := HuaWei
+  DEVICE_MODEL := HG255D
 endef
 TARGET_DEVICES += hg255d
 
@@ -372,27 +427,31 @@ define Device/hlk-rm04
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | hilink-header
-  DEVICE_TITLE := Hi-Link HLK-RM04
+  DEVICE_VENDOR := Hi-Link
+  DEVICE_MODEL := HLK-RM04
 endef
 TARGET_DEVICES += hlk-rm04
 
 define Device/ht-tm02
   DTS := HT-TM02
-  DEVICE_TITLE := HooToo HT-TM02
+  DEVICE_VENDOR := HooToo
+  DEVICE_MODEL := HT-TM02
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += ht-tm02
 
 define Device/hw550-3g
   DTS := HW550-3G
-  DEVICE_TITLE := Aztech HW550-3G
+  DEVICE_VENDOR := Aztech
+  DEVICE_MODEL := HW550-3G
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hw550-3g
 
 define Device/ip2202
   DTS := IP2202
-  DEVICE_TITLE := Poray IP2202
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := IP2202
 endef
 TARGET_DEVICES += ip2202
 
@@ -402,7 +461,8 @@ define Device/jhr-n805r
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 29.24
-  DEVICE_TITLE := JCG JHR-N805R
+  DEVICE_VENDOR := JCG
+  DEVICE_MODEL := JHR-N805R
 endef
 TARGET_DEVICES += jhr-n805r
 
@@ -412,7 +472,8 @@ define Device/jhr-n825r
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 23.24
-  DEVICE_TITLE := JCG JHR-N825R
+  DEVICE_VENDOR := JCG
+  DEVICE_MODEL := JHR-N825R
 endef
 TARGET_DEVICES += jhr-n825r
 
@@ -422,14 +483,16 @@ define Device/jhr-n926r
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 25.24
-  DEVICE_TITLE := JCG JHR-N926R
+  DEVICE_VENDOR := JCG
+  DEVICE_MODEL := JHR-N926R
 endef
 TARGET_DEVICES += jhr-n926r
 
 define Device/m2m
   DTS := M2M
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := Intenso Memory 2 Move
+  DEVICE_VENDOR := Intenso
+  DEVICE_MODEL := Memory 2 Move
   DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer \
 		kmod-usb-core kmod-usb2 kmod-usb-storage kmod-scsi-core \
 		kmod-fs-ext4 kmod-fs-vfat block-mount
@@ -442,7 +505,8 @@ define Device/m3
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M3 -F 4M
-  DEVICE_TITLE := Poray M3
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := M3
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
 	kmod-ledtrig-timer
 endef
@@ -454,7 +518,9 @@ define Device/m4-4M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 4M
-  DEVICE_TITLE := Poray M4 (4MB)
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := M4
+  DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
 	kmod-ledtrig-timer
 endef
@@ -465,26 +531,31 @@ define Device/m4-8M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 8M
-  DEVICE_TITLE := Poray M4 (8MB)
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := M4
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
 endef
 TARGET_DEVICES += m4-8M
 
 define Device/miniembplug
   DTS := MINIEMBPLUG
-  DEVICE_TITLE := Omnima MiniEMBPlug
+  DEVICE_VENDOR := Omnima
+  DEVICE_MODEL := MiniEMBPlug
 endef
 TARGET_DEVICES += miniembplug
 
 define Device/miniembwifi
   DTS := MINIEMBWIFI
-  DEVICE_TITLE := Omnima MiniEMBWiFi
+  DEVICE_VENDOR := Omnima
+  DEVICE_MODEL := MiniEMBWiFi
 endef
 TARGET_DEVICES += miniembwifi
 
 define Device/mofi3500-3gn
   DTS := MOFI3500-3GN
-  DEVICE_TITLE := MoFi Network MOFI3500-3GN
+  DEVICE_VENDOR := MoFi Network
+  DEVICE_MODEL := MOFI3500-3GN
 endef
 TARGET_DEVICES += mofi3500-3gn
 
@@ -493,7 +564,9 @@ define Device/mpr-a1
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := HAME MPR-A1
+  DEVICE_VENDOR := HAME
+  DEVICE_MODEL := MPR
+  DEVICE_VARIANT := A1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
 endef
 TARGET_DEVICES += mpr-a1
@@ -501,14 +574,17 @@ TARGET_DEVICES += mpr-a1
 define Device/mpr-a2
   DTS := MPRA2
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := HAME MPR-A2
+  DEVICE_VENDOR := HAME
+  DEVICE_MODEL := MPR
+  DEVICE_VARIANT := A2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
 endef
 TARGET_DEVICES += mpr-a2
 
 define Device/mr-102n
   DTS := MR-102N
-  DEVICE_TITLE := AXIMCom MR-102N
+  DEVICE_VENDOR := AXIMCom
+  DEVICE_MODEL := MR-102N
 endef
 TARGET_DEVICES += mr-102n
 
@@ -516,7 +592,8 @@ define Device/mzk-dp150n
   DTS := MZK-DP150N
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Planex MZK-DP150N
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-DP150N
   DEVICE_PACKAGES := kmod-spi-dev
 endef
 TARGET_DEVICES += mzk-dp150n
@@ -527,13 +604,15 @@ define Device/mzk-w300nh2
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | \
 	edimax-header -s CSYS -m RN52 -f 0x50000 -S 0xc0000
-  DEVICE_TITLE := Planex MZK-W300NH2
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-W300NH2
 endef
 TARGET_DEVICES += mzk-w300nh2
 
 define Device/mzk-wdpr
   DTS := MZK-WDPR
-  DEVICE_TITLE := Planex MZK-WDPR
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-WDPR
 endef
 TARGET_DEVICES += mzk-wdpr
 
@@ -541,20 +620,23 @@ define Device/nbg-419n
   DTS := NBG-419N
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := ZyXEL NBG-419N
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := NBG-419N
 endef
 TARGET_DEVICES += nbg-419n
 
 define Device/nbg-419n2
   DTS := NBG-419N2
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_TITLE := ZyXEL NBG-419N2
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := NBG-419N2
 endef
 TARGET_DEVICES += nbg-419n2
 
 define Device/ncs601w
   DTS := NCS601W
-  DEVICE_TITLE := Wansview NCS601W
+  DEVICE_VENDOR := Wansview
+  DEVICE_MODEL := NCS601W
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \
 		kmod-usb-core kmod-usb-ohci
 endef
@@ -564,7 +646,9 @@ define Device/nixcore-x1-8M
   DTS := NIXCORE-8M
   IMAGE_SIZE := 7872k
   SUPPORTED_DEVICES += nixcore-x1
-  DEVICE_TITLE := NixcoreX1 (8M)
+  DEVICE_VENDOR := Nixcore
+  DEVICE_MODEL := X1
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
 endef
 TARGET_DEVICES += nixcore-x1-8M
@@ -573,7 +657,9 @@ define Device/nixcore-x1-16M
   DTS := NIXCORE-16M
   IMAGE_SIZE := 16064k
   SUPPORTED_DEVICES += nixcore-x1
-  DEVICE_TITLE := NixcoreX1 (16M)
+  DEVICE_VENDOR := Nixcore
+  DEVICE_MODEL := X1
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
 endef
 TARGET_DEVICES += nixcore-x1-16M
@@ -582,7 +668,8 @@ define Device/nw718
   DTS := NW718
   IMAGE_SIZE := 3712k
   UIMAGE_NAME:= ARA1B4NCRNW718;1
-  DEVICE_TITLE := Netcore NW718
+  DEVICE_VENDOR := Netcore
+  DEVICE_MODEL := NW718
 endef
 TARGET_DEVICES += nw718
 
@@ -590,13 +677,15 @@ define Device/psr-680w
   DTS := PSR-680W
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Petatel PSR-680W Wireless 3G Router
+  DEVICE_VENDOR := Petatel
+  DEVICE_MODEL := PSR-680W Wireless 3G Router
 endef
 TARGET_DEVICES += psr-680w
 
 define Device/pwh2004
   DTS := PWH2004
-  DEVICE_TITLE := Prolink PWH2004
+  DEVICE_VENDOR := Prolink
+  DEVICE_MODEL := PWH2004
   DEVICE_PACKAGES :=
 endef
 TARGET_DEVICES += pwh2004
@@ -604,7 +693,9 @@ TARGET_DEVICES += pwh2004
 define Device/px-4885-4M
   DTS := PX-4885-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := 7Links PX-4885 (4M)
+  DEVICE_VENDOR := 7Links
+  DEVICE_MODEL := PX-4885
+  DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
 	kmod-usb-ledtrig-usbport kmod-leds-gpio
 endef
@@ -612,7 +703,9 @@ TARGET_DEVICES += px-4885-4M
 
 define Device/px-4885-8M
   DTS := PX-4885-8M
-  DEVICE_TITLE := 7Links PX-4885 (8M)
+  DEVICE_VENDOR := 7Links
+  DEVICE_MODEL := PX-4885
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
 	kmod-usb-ledtrig-usbport kmod-leds-gpio
 endef
@@ -620,7 +713,8 @@ TARGET_DEVICES += px-4885-8M
 
 define Device/rt5350f-olinuxino
   DTS := RT5350F-OLINUXINO
-  DEVICE_TITLE := RT5350F-OLinuXino
+  DEVICE_VENDOR := OLIMEX
+  DEVICE_MODEL := RT5350F-OLinuXino
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-ralink \
 		kmod-spi-dev
@@ -629,7 +723,8 @@ TARGET_DEVICES += rt5350f-olinuxino
 
 define Device/rt5350f-olinuxino-evb
   DTS := RT5350F-OLINUXINO-EVB
-  DEVICE_TITLE := RT5350F-OLinuXino-EVB
+  DEVICE_VENDOR := OLIMEX
+  DEVICE_MODEL := RT5350F-OLinuXino-EVB
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-ralink \
 		kmod-spi-dev
@@ -640,7 +735,9 @@ define Device/rt-g32-b1
   DTS := RT-G32-B1
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Asus RT-G32 B1
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-G32
+  DEVICE_VARIANT := B1
 endef
 TARGET_DEVICES += rt-g32-b1
 
@@ -648,20 +745,23 @@ define Device/rt-n10-plus
   DTS := RT-N10-PLUS
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Asus RT-N10+
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N10+
 endef
 TARGET_DEVICES += rt-n10-plus
 
 define Device/rt-n13u
   DTS := RT-N13U
-  DEVICE_TITLE := Asus RT-N13U
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N13U
   DEVICE_PACKAGES := kmod-leds-gpio kmod-rt2800-pci kmod-usb-dwc2
 endef
 TARGET_DEVICES += rt-n13u
 
 define Device/rut5xx
   DTS := RUT5XX
-  DEVICE_TITLE := Teltonika RUT5XX
+  DEVICE_VENDOR := Teltonika
+  DEVICE_MODEL := RUT5XX
   DEVICE_PACKAGES := om-watchdog
 endef
 TARGET_DEVICES += rut5xx
@@ -670,7 +770,8 @@ define Device/sl-r7205
   DTS := SL-R7205
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Skyline SL-R7205 Wireless 3G Router
+  DEVICE_VENDOR := Skyline
+  DEVICE_MODEL := SL-R7205 Wireless 3G Router
 endef
 TARGET_DEVICES += sl-r7205
 
@@ -680,13 +781,16 @@ define Device/tew-638apb-v2
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \
         append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := TRENDnet TEW-638APB v2
+  DEVICE_VENDOR := TRENDnet
+  DEVICE_MODEL := TEW-638APB
+  DEVICE_VARIANT := v2
 endef
 TARGET_DEVICES += tew-638apb-v2
 
 define Device/tew-714tru
   DTS := TEW-714TRU
-  DEVICE_TITLE := TRENDnet TEW-714TRU
+  DEVICE_VENDOR := TRENDnet
+  DEVICE_MODEL := TEW-714TRU
 endef
 TARGET_DEVICES += tew-714tru
 
@@ -694,14 +798,16 @@ define Device/ur-326n4g
   DTS := UR-326N4G
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := UPVEL UR-326N4G
+  DEVICE_VENDOR := UPVEL
+  DEVICE_MODEL := UR-326N4G
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += ur-326n4g
 
 define Device/ur-336un
   DTS := UR-336UN
-  DEVICE_TITLE := UPVEL UR-336UN
+  DEVICE_VENDOR := UPVEL
+  DEVICE_MODEL := UR-336UN
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += ur-336un
@@ -710,7 +816,8 @@ define Device/v22rw-2x2
   DTS := V22RW-2X2
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Ralink AP-RT3052-V22RW-2X2
+  DEVICE_VENDOR := Ralink
+  DEVICE_MODEL := AP-RT3052-V22RW-2X2
 endef
 TARGET_DEVICES += v22rw-2x2
 
@@ -718,7 +825,9 @@ define Device/vocore-8M
   DTS := VOCORE-8M
   IMAGE_SIZE := 7872k
   SUPPORTED_DEVICES += vocore
-  DEVICE_TITLE := VoCore (8M)
+  DEVICE_VENDOR := VoCore
+  DEVICE_MODEL := VoCore
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-ralink \
 		kmod-spi-dev
@@ -729,7 +838,9 @@ define Device/vocore-16M
   DTS := VOCORE-16M
   IMAGE_SIZE := 16064k
   SUPPORTED_DEVICES += vocore
-  DEVICE_TITLE := VoCore (16M)
+  DEVICE_VENDOR := VoCore
+  DEVICE_MODEL := VoCore
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-ralink \
 		kmod-spi-dev
@@ -740,7 +851,8 @@ define Device/w150m
   DTS := W150M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= W150M Kernel Image
-  DEVICE_TITLE := Tenda W150M
+  DEVICE_VENDOR := Tenda
+  DEVICE_MODEL := W150M
 endef
 TARGET_DEVICES += w150m
 
@@ -748,13 +860,16 @@ define Device/w306r-v20
   DTS := W306R_V20
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= linkn Kernel Image
-  DEVICE_TITLE := Tenda W306R V2.0
+  DEVICE_VENDOR := Tenda
+  DEVICE_MODEL := W306R
+  DEVICE_VARIANT := V2.0
 endef
 TARGET_DEVICES += w306r-v20
 
 define Device/w502u
   DTS := W502U
-  DEVICE_TITLE := ALFA Networks W502U
+  DEVICE_VENDOR := ALFA
+  DEVICE_MODEL := Networks W502U
 endef
 TARGET_DEVICES += w502u
 
@@ -762,7 +877,8 @@ define Device/wcr-150gn
   DTS := WCR150GN
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Sparklan WCR-150GN
+  DEVICE_VENDOR := Sparklan
+  DEVICE_MODEL := WCR-150GN
 endef
 TARGET_DEVICES += wcr-150gn
 
@@ -770,7 +886,8 @@ define Device/whr-g300n
   DTS := WHR-G300N
   BLOCKSIZE := 64k
   IMAGE_SIZE := 3801088
-  DEVICE_TITLE := Buffalo WHR-G300N
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-G300N
   IMAGES += tftp.bin
   IMAGE/tftp.bin := $$(sysupgrade_bin) | \
     check-size $$$$(IMAGE_SIZE) | buffalo-tftp-header
@@ -780,14 +897,16 @@ TARGET_DEVICES += whr-g300n
 define Device/wizard8800
   DTS := WIZARD8800
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := EasyAcc WIZARD 8800
+  DEVICE_VENDOR := EasyAcc
+  DEVICE_MODEL := WIZARD 8800
 endef
 TARGET_DEVICES += wizard8800
 
 define Device/wizfi630a
   DTS := WIZFI630A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := WIZnet WizFi630A
+  DEVICE_VENDOR := WIZnet
+  DEVICE_MODEL := WizFi630A
 endef
 TARGET_DEVICES += wizfi630a
 
@@ -795,7 +914,8 @@ define Device/wl-330n
   DTS := WL-330N
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Asus WL-330N
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := WL-330N
 endef
 TARGET_DEVICES += wl-330n
 
@@ -803,7 +923,8 @@ define Device/wl-330n3g
   DTS := WL-330N3G
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Asus WL-330N3G
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := WL-330N3G
   DEVICE_PACKAGES :=
 endef
 TARGET_DEVICES += wl-330n3g
@@ -812,7 +933,8 @@ define Device/wl-351
   DTS := WL-351
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Sitecom WL-351 v1
+  DEVICE_VENDOR := Sitecom
+  DEVICE_MODEL := WL-351 v1
   DEVICE_PACKAGES := kmod-switch-rtl8366rb kmod-swconfig swconfig
 endef
 TARGET_DEVICES += wl-351
@@ -825,26 +947,30 @@ define Device/wnce2001
 	dap-header -s RT3052-AP-WNCE2001-3 -r WW -v 1.0.0.99
   IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	dap-header -s RT3052-AP-WNCE2001-3 -r NA -v 1.0.0.99
-  DEVICE_TITLE := Netgear WNCE2001
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WNCE2001
 endef
 TARGET_DEVICES += wnce2001
 
 define Device/wr512-3gn-4M
   DTS := WR512-3GN-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := WR512-3GN (4M)
+  DEVICE_VENDOR := Ralink
+  DEVICE_MODEL := WR512-3GN (4M)
 endef
 TARGET_DEVICES += wr512-3gn-4M
 
 define Device/wr512-3gn-8M
   DTS := WR512-3GN-8M
-  DEVICE_TITLE := WR512-3GN (8M)
+  DEVICE_VENDOR := Ralink
+  DEVICE_MODEL := WR512-3GN (8M)
 endef
 TARGET_DEVICES += wr512-3gn-8M
 
 define Device/wr6202
   DTS := WR6202
-  DEVICE_TITLE := AWB WR6202
+  DEVICE_VENDOR := AWB
+  DEVICE_MODEL := WR6202
 endef
 TARGET_DEVICES += wr6202
 
@@ -854,7 +980,8 @@ define Device/wt1520-4M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 4M
-  DEVICE_TITLE := Nexx WT1520 (4MB)
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT1520 (4MB)
 endef
 TARGET_DEVICES += wt1520-4M
 
@@ -863,7 +990,8 @@ define Device/wt1520-8M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 8M
-  DEVICE_TITLE := Nexx WT1520 (8MB)
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT1520 (8MB)
 endef
 TARGET_DEVICES += wt1520-8M
 
@@ -872,7 +1000,8 @@ define Device/x5
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X5 -F 8M
-  DEVICE_TITLE := Poray X5/X6
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := X5/X6
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
 endef
 TARGET_DEVICES += x5
@@ -883,7 +1012,8 @@ define Device/x8
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X8 -F 8M
-  DEVICE_TITLE := Poray X8
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := X8
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
 endef
 TARGET_DEVICES += x8
@@ -892,7 +1022,8 @@ define Device/xdxrn502j
   DTS := XDXRN502J
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := XDX RN502J
+  DEVICE_VENDOR := XDX
+  DEVICE_MODEL := RN502J
 endef
 TARGET_DEVICES += xdxrn502j
 
@@ -900,7 +1031,8 @@ define Device/kn
   DTS := kn
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := ZyXEL Keenetic
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ehci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += kn
@@ -908,13 +1040,15 @@ TARGET_DEVICES += kn
 define Device/zyxel_keenetic-start
   DTS := kn_st
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := ZyXEL Keenetic Start
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Start
 endef
 TARGET_DEVICES += zyxel_keenetic-start
 
 define Device/zorlik_zl5900v2
   DTS := ZL5900V2
-  DEVICE_TITLE := Zorlik ZL5900V2
+  DEVICE_VENDOR := Zorlik
+  DEVICE_MODEL := ZL5900V2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
 endef
 TARGET_DEVICES += zorlik_zl5900v2