lantiq: split up DEVICE_TITLE

DEVICE_TITLE is split up into DEVICE_VENDOR, DEVICE_MODEL and DEVICE_VARIANT
Uses DEVICE_ALT* variables for alternative vendor/retailer names.

Signed-off-by: Moritz Warning <moritzwarning@web.de>

2 files changed, 201 insertions, 66 deletions

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index f71a262c82..4cacaccba9 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -100,6 +100,7 @@ define Device/lantiqFullImage
 endef
 
 define Device/AVM
+  DEVICE_VENDOR := AVM
   KERNEL := kernel-bin | append-dtb | lzma | eva-image
   KERNEL_INITRAMFS := $$(KERNEL)
   IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-avm-fakeroot | \
@@ -109,9 +110,10 @@ endef
 ifeq ($(SUBTARGET),ase)
 
 define Device/allnet_all0333cj
+  DEVICE_VENDOR := Allnet
+  DEVICE_MODEL := ALL0333CJ
   IMAGE_SIZE := 3700k
   DEVICE_DTS := ALL0333CJ
-  DEVICE_TITLE := Allnet ALL0333CJ
   DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \
 	kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \
 	ltq-adsl-app ppp-mod-pppoe
@@ -119,9 +121,10 @@ endef
 TARGET_DEVICES += allnet_all0333cj
 
 define Device/netgear_dgn1000b
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := DGN1000B
   IMAGE_SIZE := 6000k
   DEVICE_DTS := DGN1000B
-  DEVICE_TITLE := Netgear DGN1000B
   DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \
 	kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \
 	ltq-adsl-app ppp-mod-pppoe
@@ -134,9 +137,14 @@ endif
 ifeq ($(SUBTARGET),xway_legacy)
 
 define Device/arcadyan_arv4520pw
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV4520PW
+  DEVICE_ALT0_VENDOR := Vodafone
+  DEVICE_ALT0_MODEL := Easybox 800
+  DEVICE_ALT1_VENDOR := Airties
+  DEVICE_ALT1_MODEL := WAV-281
   IMAGE_SIZE := 3648k
   DEVICE_DTS := ARV4520PW
-  DEVICE_TITLE := Easybox 800, WAV-281 - ARV4520PW
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -147,9 +155,13 @@ endef
 TARGET_DEVICES += arcadyan_arv4520pw
 
 define Device/arcadyan_arv4525pw
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV4525PW
+  DEVICE_ALT0_VENDOR := Telekom
+  DEVICE_ALT0_MODEL := Speedport W502V
+  DEVICE_ALT0_VARIANT := Typ A
   IMAGE_SIZE := 3776k
   DEVICE_DTS := ARV4525PW
-  DEVICE_TITLE := Speedport W502V Typ A - ARV4525PW
   DEVICE_PACKAGES := kmod-ath5k wpad-mini \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -159,9 +171,12 @@ endef
 TARGET_DEVICES += arcadyan_arv4525pw
 
 define Device/arcadyan_arv452cqw
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV452CQW
+  DEVICE_ALT0_VENDOR := Vodafone
+  DEVICE_ALT0_MODEL := Easybox 801
   IMAGE_SIZE := 3776k
   DEVICE_DTS := ARV452CQW
-  DEVICE_TITLE := Easybox 801 - ARV452CQW
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ath5k wpad-mini \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -172,9 +187,10 @@ endef
 TARGET_DEVICES += arcadyan_arv452cqw
 
 define Device/arcadyan_arv4518pwr01
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV4518PWR01
   IMAGE_SIZE := 3776k
   DEVICE_DTS := ARV4518PWR01
-  DEVICE_TITLE := ARV4518PWR01
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -185,9 +201,10 @@ endef
 TARGET_DEVICES += arcadyan_arv4518pwr01
 
 define Device/arcadyan_arv4518pwr01a
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV4518PWR01A
   IMAGE_SIZE := 3776k
   DEVICE_DTS := ARV4518PWR01A
-  DEVICE_TITLE := ARV4518PWR01A
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -205,9 +222,11 @@ ifeq ($(SUBTARGET),xway)
 
 define Device/bt_homehub-v2b
   $(Device/NAND)
+  DEVICE_VENDOR := British Telecom
+  DEVICE_MODEL := Home Hub 2
+  DEVICE_VARIANT := Type B
   BOARD_NAME := BTHOMEHUBV2B
   DEVICE_DTS := BTHOMEHUBV2B
-  DEVICE_TITLE := BT Home Hub 2B
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -219,16 +238,18 @@ endef
 TARGET_DEVICES += bt_homehub-v2b
 
 define Device/lantiq_easy50712
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := Danube (EASY50712)
   DEVICE_DTS := EASY50712
   IMAGE_SIZE := 3776k
-  DEVICE_TITLE := Lantiq Danube - EASY50712
 endef
 TARGET_DEVICES += lantiq_easy50712
 
 define Device/audiocodes_mp-252
+  DEVICE_VENDOR := AudioCodes
+  DEVICE_MODEL := MediaPack MP-252
   IMAGE_SIZE := 14848k
   DEVICE_DTS := ACMP252
-  DEVICE_TITLE := AudioCodes MediaPack MP-252
   DEVICE_PACKAGES :=  kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
 	kmod-ltq-tapi kmod-ltq-vmmc \
@@ -241,9 +262,12 @@ endef
 TARGET_DEVICES += audiocodes_mp-252
 
 define Device/arcadyan_arv4510pw
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV4510PW
+  DEVICE_ALT0_VENDOR := Wippies
+  DEVICE_ALT0_MODEL := BeWan iBox v1.0
   IMAGE_SIZE := 15616k
   DEVICE_DTS := ARV4510PW
-  DEVICE_TITLE := Wippies, Elisa - ARV4510PW
   DEVICE_PACKAGES := kmod-usb-ledtrig-usbport kmod-usb2-pci kmod-usb-uhci \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -255,9 +279,13 @@ endef
 TARGET_DEVICES += arcadyan_arv4510pw
 
 define Device/arcadyan_arv7525pw
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV7525PW
+  DEVICE_ALT0_VENDOR := Telekom
+  DEVICE_ALT0_MODEL := Speedport W303V
+  DEVICE_ALT0_VARIANT := Typ A
   IMAGE_SIZE := 3776k
   DEVICE_DTS := ARV4510PW
-  DEVICE_TITLE := Speedport W303V Typ A - ARV7525PW
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -267,9 +295,14 @@ endef
 TARGET_DEVICES += arcadyan_arv7525pw
 
 define Device/arcadyan_arv4519pw
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV4519PW
+  DEVICE_ALT0_VENDOR := Vodafone
+  DEVICE_ALT0_MODEL := NetFasteR IAD 2
+  DEVICE_ALT1_VENDOR := Pirelli
+  DEVICE_ALT1_MODEL := P.RG A4201G
   IMAGE_SIZE := 3776k
   DEVICE_DTS := ARV4519PW
-  DEVICE_TITLE := Vodafone, Pirelli - ARV4519PW
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -279,9 +312,12 @@ endef
 TARGET_DEVICES += arcadyan_arv4519pw
 
 define Device/arcadyan_arv7506pw11
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV7506PW11
+  DEVICE_ALT0_VENDOR := Alice/O2
+  DEVICE_ALT0_MODEL := IAD 4421
   IMAGE_SIZE := 7808k
   DEVICE_DTS := ARV7506PW11
-  DEVICE_TITLE := Alice/O2 IAD 4421 - ARV7506PW11
   DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
@@ -291,9 +327,12 @@ endef
 TARGET_DEVICES += arcadyan_arv7506pw11
 
 define Device/arcadyan_arv7510pw22
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV7510PW22
+  DEVICE_ALT0_VENDOR := Astoria Networks
+  DEVICE_ALT0_MODEL := ARV7510PW22
   IMAGE_SIZE := 31232k
   DEVICE_DTS := ARV7510PW22
-  DEVICE_TITLE := Astoria - ARV7510PW22
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -306,9 +345,12 @@ endef
 TARGET_DEVICES += arcadyan_arv7510pw22
 
 define Device/arcadyan_arv7518pw
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV7518PW
+  DEVICE_ALT0_VENDOR := Astoria Networks
+  DEVICE_ALT0_MODEL := ARV7518PW
   IMAGE_SIZE := 7872k
   DEVICE_DTS := ARV7518PW
-  DEVICE_TITLE := Astoria - ARV7518PW
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -319,9 +361,12 @@ endef
 TARGET_DEVICES += arcadyan_arv7518pw
 
 define Device/arcadyan_arv7519pw
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV7519PW
+  DEVICE_ALT0_VENDOR := Astoria Networks
+  DEVICE_ALT0_MODEL := ARV7519PW
   IMAGE_SIZE := 15488k
   DEVICE_DTS := ARV7519PW
-  DEVICE_TITLE := Astoria - ARV7519PW
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -332,9 +377,12 @@ endef
 TARGET_DEVICES += arcadyan_arv7519pw
 
 define Device/arcadyan_arv752dpw
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV752DPW
+  DEVICE_ALT0_VENDOR := Vodafone
+  DEVICE_ALT0_MODEL := Easybox 802
   IMAGE_SIZE := 7872k
   DEVICE_DTS := ARV752DPW
-  DEVICE_TITLE := Easybox 802 - ARV752DPW
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -346,9 +394,12 @@ endef
 TARGET_DEVICES += arcadyan_arv752dpw
 
 define Device/arcadyan_arv752dpw22
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV752DPW22
+  DEVICE_ALT0_VENDOR := Vodafone
+  DEVICE_ALT0_MODEL := Easybox 803
   IMAGE_SIZE := 7616k
   DEVICE_DTS := ARV752DPW22
-  DEVICE_TITLE := Easybox 803 - ARV752DPW22
   DEVICE_PACKAGES := kmod-usb2-pci kmod-usb-uhci kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -360,9 +411,12 @@ endef
 TARGET_DEVICES += arcadyan_arv752dpw22
 
 define Device/arcadyan_arv8539pw22
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV8539PW22
+  DEVICE_ALT0_VENDOR := Telekom
+  DEVICE_ALT0_MODEL := Speedport W504V Typ A
   IMAGE_SIZE := 7616k
   DEVICE_DTS := ARV8539PW22
-  DEVICE_TITLE := Speedport W504V Typ A - ARV8539PW22
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -373,9 +427,10 @@ endef
 TARGET_DEVICES += arcadyan_arv8539pw22
 
 define Device/siemens_gigaset-sx76x
+  DEVICE_VENDOR := Siemens
+  DEVICE_MODEL := Gigaset sx76x
   IMAGE_SIZE := 7680k
   DEVICE_DTS := GIGASX76X
-  DEVICE_TITLE := Gigaset sx76x
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -390,9 +445,11 @@ TARGET_DEVICES += siemens_gigaset-sx76x
 
 define Device/bt_homehub-v3a
   $(Device/NAND)
+  DEVICE_VENDOR := British Telecom
+  DEVICE_MODEL := Home Hub
+  DEVICE_VARIANT := Type A
   BOARD_NAME := BTHOMEHUBV3A
   DEVICE_DTS := BTHOMEHUBV3A
-  DEVICE_TITLE := BT Home Hub 3A
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
@@ -407,6 +464,8 @@ TARGET_DEVICES += bt_homehub-v3a
 DGN3500_KERNEL_OFFSET_HEX=0x50000
 DGN3500_KERNEL_OFFSET_DEC=327680
 define Device/netgear_dgn3500
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := DGN3500
   DEVICE_DTS := DGN3500
   IMAGE_SIZE := 16000k
   IMAGES := \
@@ -426,7 +485,6 @@ define Device/netgear_dgn3500
 	pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \
 	dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "WW" | pad-rootfs | \
 	check-size 16320k | pad-to 16384k
-  DEVICE_TITLE := Netgear DGN3500
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ath9k kmod-owl-loader wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
@@ -438,6 +496,8 @@ endef
 TARGET_DEVICES += netgear_dgn3500
 
 define Device/netgear_dgn3500b
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := DGN3500B
   DEVICE_DTS := DGN3500B
   IMAGE_SIZE := 16000k
   IMAGES += factory.img
@@ -448,7 +508,6 @@ define Device/netgear_dgn3500b
 	pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \
 	dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \
 	check-size 16320k | pad-to 16384k
-  DEVICE_TITLE := Netgear DGN3500B
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ath9k kmod-owl-loader wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
@@ -460,9 +519,11 @@ endef
 TARGET_DEVICES += netgear_dgn3500b
 
 define Device/buffalo_wbmr-hp-g300h-a
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WBMR-HP-G300H
+  DEVICE_VARIANT := A
   IMAGE_SIZE := 31488k
   DEVICE_DTS := WBMR
-  DEVICE_TITLE := Buffalo WBMR-HP-G300H (A) - WBMR
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
@@ -473,9 +534,11 @@ endef
 TARGET_DEVICES += buffalo_wbmr-hp-g300h-a
 
 define Device/buffalo_wbmr-hp-g300h-b
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WBMR-HP-G300H
+  DEVICE_VARIANT := B
   IMAGE_SIZE := 31488k
   DEVICE_DTS := WBMR
-  DEVICE_TITLE := Buffalo WBMR-HP-G300H (B) - WBMR
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
@@ -487,9 +550,9 @@ TARGET_DEVICES += buffalo_wbmr-hp-g300h-b
 
 define Device/avm_fritz7312
   $(Device/AVM)
+  DEVICE_MODEL := FRITZ!Box 7312
   DEVICE_DTS := FRITZ7312
   IMAGE_SIZE := 15744k
-  DEVICE_TITLE := AVM FRITZ!Box 7312
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
@@ -500,9 +563,11 @@ TARGET_DEVICES += avm_fritz7312
 
 define Device/avm_fritz7320
   $(Device/AVM)
+  DEVICE_MODEL := FRITZ!Box 7320
+  DEVICE_ALT0_VENDOR := 1&1
+  DEVICE_ALT0_MODEL := HomeServer
   DEVICE_DTS := FRITZ7320
   IMAGE_SIZE := 15744k
-  DEVICE_TITLE := AVM FRITZ!Box 7320
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
@@ -513,9 +578,10 @@ endef
 TARGET_DEVICES += avm_fritz7320
 
 define Device/zte_h201l
+  DEVICE_VENDOR := ZTE
+  DEVICE_MODEL := H201L
   IMAGE_SIZE := 7808k
   DEVICE_DTS := H201L
-  DEVICE_TITLE := ZTE H201L - H201L
   DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
@@ -527,9 +593,11 @@ endef
 TARGET_DEVICES += zte_h201l
 
 define Device/zyxel_p-2601hn
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := P-2601HN
+  DEVICE_VARIANT := F1/F3
   IMAGE_SIZE := 15616k
   DEVICE_DTS := P2601HNFX
-  DEVICE_TITLE := ZyXEL P-2601HN-Fx
   DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
@@ -549,9 +617,11 @@ ifeq ($(SUBTARGET),xrx200)
 
 define Device/zyxel_p-2812hnu-f1
   $(Device/NAND)
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := P-2812HNU
+  DEVICE_VARIANT := F1
   BOARD_NAME := P2812HNUF1
   DEVICE_DTS := P2812HNUF1
-  DEVICE_TITLE := ZyXEL P-2812HNU-F1
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   KERNEL_SIZE := 3072k
   SUPPORTED_DEVICES += P2812HNUF1
@@ -560,35 +630,46 @@ TARGET_DEVICES += zyxel_p-2812hnu-f1
 
 define Device/zyxel_p-2812hnu-f3
   $(Device/NAND)
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := P-2812HNU
+  DEVICE_VARIANT := F3
   BOARD_NAME := P2812HNUF3
   DEVICE_DTS := P2812HNUF3
-  DEVICE_TITLE := ZyXEL P-2812HNU-F3
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += P2812HNUF3
 endef
 TARGET_DEVICES += zyxel_p-2812hnu-f3
 
 define Device/arcadyan_arv7519rw22
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := ARV7519RW22
+  DEVICE_ALT0_VENDOR := Orange
+  DEVICE_ALT0_MODEL := Livebox
+  DEVICE_ALT0_VARIANT := 2.1
+  DEVICE_ALT1_VENDOR := Astoria Networks
+  DEVICE_ALT1_MODEL := ARV7519RW22
   IMAGE_SIZE := 31232k
   DEVICE_DTS := ARV7519RW22
-  DEVICE_TITLE := Livebox Astoria ARV7519RW22
   DEVICE_PACKAGES := kmod-usb-dwc2
   SUPPORTED_DEVICES += ARV7519RW22
 endef
 TARGET_DEVICES += arcadyan_arv7519rw22
 
 define Device/alphanetworks_asl56026
+  DEVICE_VENDOR := BT Openreach
+  DEVICE_MODEL := ECI VDSL Modem V-2FUb/I
   DEVICE_DTS := ASL56026
   IMAGE_SIZE := 7488k
-  DEVICE_TITLE := BT OpenReach - ECI VDSL Modem V-2FUb/I
 endef
 TARGET_DEVICES += alphanetworks_asl56026
 
 define Device/bt_homehub-v5a
   $(Device/NAND)
+  DEVICE_VENDOR := British Telecom
+  DEVICE_MODEL := Home Hub 5
+  DEVICE_VARIANT := Type A
   BOARD_NAME := BTHOMEHUBV5A
   DEVICE_DTS := BTHOMEHUBV5A
-  DEVICE_TITLE := BT Home Hub 5A
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \
 	kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += BTHOMEHUBV5A
@@ -596,6 +677,8 @@ endef
 TARGET_DEVICES += bt_homehub-v5a
 
 define Device/netgear_dm200
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := DM200
   DEVICE_DTS := DM200
   IMAGES := sysupgrade.bin factory.img
   IMAGE/sysupgrade.bin := append-kernel | \
@@ -604,7 +687,6 @@ define Device/netgear_dm200
 	append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
   IMAGE/factory.img := $$(IMAGE/sysupgrade.bin) | netgear-dni
   IMAGE_SIZE := 7872k
-  DEVICE_TITLE := Netgear DM200
   NETGEAR_BOARD_ID := DM200
   NETGEAR_HW_ID := 29765233+8+0+64+0+0
 endef
@@ -613,17 +695,21 @@ TARGET_DEVICES += netgear_dm200
 
 define Device/lantiq_easy80920-nand
   $(Device/lantiqFullImage)
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := VR9 EASY80920
+  DEVICE_VARIANT := NAND
   DEVICE_DTS := EASY80920NAND
   IMAGE_SIZE := 64512k
-  DEVICE_TITLE := Lantiq VR9 - EASY80920NAND
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += lantiq_easy80920-nand
 
 define Device/lantiq_easy80920-nor
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := VR9 EASY80920
+  DEVICE_VARIANT := NOR
   DEVICE_DTS := EASY80920NOR
   IMAGE_SIZE := 7936k
-  DEVICE_TITLE := Lantiq VR9 - EASY80920NOR
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += lantiq_easy80920-nor
@@ -631,8 +717,9 @@ TARGET_DEVICES += lantiq_easy80920-nor
 define Device/avm_fritz3370
   $(Device/AVM)
   $(Device/NAND)
+  DEVICE_MODEL := FRITZ!Box 3370
+  DEVICE_VARIANT := Rev. 2
   DEVICE_DTS := FRITZ3370
-  DEVICE_TITLE := AVM FRITZ!Box 3370 Rev. 2
   KERNEL_SIZE := 4096k
   UBINIZE_OPTS := -E 5
   IMAGES += eva-kernel.bin eva-filesystem.bin
@@ -643,23 +730,25 @@ endef
 
 define Device/avm_fritz3370-rev2-hynix
   $(Device/avm_fritz3370)
+  DEVICE_MODEL := FRITZ!Box 3370
+  DEVICE_VARIANT := Rev. 2 (Hynix NAND)
   DEVICE_DTS := FRITZ3370-REV2-HYNIX
-  DEVICE_TITLE := AVM FRITZ!Box 3370 Rev. 2 (Hynix NAND)
 endef
 TARGET_DEVICES += avm_fritz3370-rev2-hynix
 
 define Device/avm_fritz3370-rev2-micron
   $(Device/avm_fritz3370)
+  DEVICE_MODEL := FRITZ!Box 3370
+  DEVICE_VARIANT := Rev. 2 (Micron NAND)
   DEVICE_DTS := FRITZ3370-REV2-MICRON
-  DEVICE_TITLE := AVM FRITZ!Box 3370 Rev. 2 (Micron NAND)
 endef
 TARGET_DEVICES += avm_fritz3370-rev2-micron
 
 define Device/avm_fritz7360sl
   $(Device/AVM)
+  DEVICE_MODEL := FRITZ!Box 7360 SL
   IMAGE_SIZE := 15744k
   DEVICE_DTS := FRITZ7360SL
-  DEVICE_TITLE := AVM FRITZ!Box 7360 SL
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += FRITZ7360SL
 endef
@@ -668,11 +757,11 @@ TARGET_DEVICES += avm_fritz7360sl
 define Device/avm_fritz7412
   $(Device/AVM)
   $(Device/NAND)
+  DEVICE_MODEL := FRITZ!Box 7412
   BOARD_NAME := FRITZ7412
   DEVICE_DTS := FRITZ7412
   KERNEL_SIZE := 4096k
   IMAGE_SIZE := 49152k
-  DEVICE_TITLE := AVM FRITZ!Box 7412
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata
 endef
 TARGET_DEVICES += avm_fritz7412
@@ -680,18 +769,19 @@ TARGET_DEVICES += avm_fritz7412
 define Device/avm_fritz7362sl
   $(Device/AVM)
   $(Device/NAND)
+  DEVICE_MODEL := FRITZ!Box 7362 SL
   KERNEL_SIZE := 4096k
   IMAGE_SIZE := 49152k
   DEVICE_DTS := FRITZ7362SL
-  DEVICE_TITLE := AVM FRITZ!Box 7362 SL
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs
 endef
 TARGET_DEVICES += avm_fritz7362sl
 
 define Device/arcadyan_vg3503j
+  DEVICE_VENDOR := BT Openreach
+  DEVICE_MODEL := ECI VDSL Modem V-2FUb/R
   IMAGE_SIZE := 8000k
   DEVICE_DTS := VG3503J
-  DEVICE_TITLE := BT OpenReach - ECI VDSL Modem V-2FUb/R
   SUPPORTED_DEVICES += VG3503J
 endef
 TARGET_DEVICES += arcadyan_vg3503j
@@ -699,18 +789,24 @@ TARGET_DEVICES += arcadyan_vg3503j
 include tp-link.mk
 
 define Device/buffalo_wbmr-300hpd
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WBMR-300HPD
   IMAGE_SIZE := 15616k
   DEVICE_DTS := WBMR300
-  DEVICE_TITLE := Buffalo WBMR-300HPD
   DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += WBMR300
 endef
 TARGET_DEVICES += buffalo_wbmr-300hpd
 
 define Device/arcadyan_vgv7510kw22-nor
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := VGV7510KW22
+  DEVICE_VARIANT := NOR
+  DEVICE_ALT0_VENDOR := o2
+  DEVICE_ALT0_MODEL := Box 6431
+  DEVICE_ALT0_VARIANT := NOR
   IMAGE_SIZE := 15232k
   DEVICE_DTS := VGV7510KW22NOR
-  DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (NOR)
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7510KW22NOR
 endef
@@ -718,21 +814,31 @@ TARGET_DEVICES += arcadyan_vgv7510kw22-nor
 
 define Device/arcadyan_vgv7510kw22-brn
   $(Device/lantiqBrnImage)
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := VGV7510KW22
+  DEVICE_VARIANT := BRN
+  DEVICE_ALT0_VENDOR := o2
+  DEVICE_ALT0_MODEL := Box 6431
+  DEVICE_ALT0_VARIANT := BRN
   IMAGE_SIZE := 7168k
   DEVICE_DTS := VGV7510KW22BRN
   SIGNATURE := BRNDA6431
   MAGIC := 0x12345678
   CRC32_POLY := 0x04c11db7
-  DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (BRN)
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7510KW22BRN
 endef
 TARGET_DEVICES += arcadyan_vgv7510kw22-brn
 
 define Device/arcadyan_vgv7519-nor
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := VGV7519
+  DEVICE_VARIANT := NOR
+  DEVICE_ALT0_VENDOR := KPN
+  DEVICE_ALT0_MODEL := Experiabox 8
+  DEVICE_ALT0_VARIANT := NOR
   IMAGE_SIZE := 15360k
   DEVICE_DTS := VGV7519NOR
-  DEVICE_TITLE := Experiabox 8 VGV7519
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7519NOR
 endef
@@ -740,12 +846,17 @@ TARGET_DEVICES += arcadyan_vgv7519-nor
 
 define Device/arcadyan_vgv7519-brn
   $(Device/lantiqBrnImage)
+  DEVICE_VENDOR := Arcadyan
+  DEVICE_MODEL := VGV7519
+  DEVICE_VARIANT := BRN
+  DEVICE_ALT0_VENDOR := KPN
+  DEVICE_ALT0_MODEL := Experiabox 8
+  DEVICE_ALT0_VARIANT := BRN
   IMAGE_SIZE := 7168k
   DEVICE_DTS := VGV7519BRN
   SIGNATURE := 5D00008000
   MAGIC := 0x12345678
   CRC32_POLY := 0x2083b8ed
-  DEVICE_TITLE := Experiabox 8 VGV7519 (BRN)
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7519BRN
 endef
@@ -757,89 +868,108 @@ endif
 ifeq ($(SUBTARGET),falcon)
 
 define Device/lantiq_easy98000-nor
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := EASY98000 Falcon Eval Board
+  DEVICE_VARIANT := NOR
   IMAGE_SIZE := 3904k
   DEVICE_DTS := EASY98000NOR
-  DEVICE_TITLE := EASY98000 - Lantiq Falcon Eval Board NOR
   DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24
 endef
 TARGET_DEVICES += lantiq_easy98000-nor
 
 define Device/lantiq_easy98000-nand
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := EASY98000 Falcon Eval Board
+  DEVICE_VARIANT := NAND
   IMAGE_SIZE := 3904k
   DEVICE_DTS := EASY98000NAND
-  DEVICE_TITLE := EASY98000 - Lantiq Falcon Eval Board NAND
   DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24
 endef
 TARGET_DEVICES += lantiq_easy98000-nand
 
 define Device/lantiq_easy98000-sflash
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := EASY98000 Falcon Eval Board
+  DEVICE_VARIANT := SFLASH
   IMAGE_SIZE := 7424k
   DEVICE_DTS := EASY98000SFLASH
-  DEVICE_TITLE := EASY98000 - Lantiq Falcon Eval Board SFLASH
   DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24
 endef
 TARGET_DEVICES += lantiq_easy98000-sflash
 
 define Device/lantiq_falcon-mdu
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := Falcon / VINAXdp MDU Board
   IMAGE_SIZE := 7424k
   DEVICE_DTS := FALCON-MDU
-  DEVICE_TITLE := MDU - Lantiq Falcon / VINAXdp MDU Board
 endef
 TARGET_DEVICES += lantiq_falcon-mdu
 
 define Device/lantiq_easy88388
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := EASY88388 Falcon FTTDP8 Reference Board
   IMAGE_SIZE := 7424k
   DEVICE_DTS := EASY88388
-  DEVICE_TITLE := EASY88388 - Lantiq Falcon FTTDP8 Reference Board
 endef
 TARGET_DEVICES += lantiq_easy88388
 
 define Device/lantiq_easy88444
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := EASY88444 Falcon FTTdp G.FAST Reference Board
   IMAGE_SIZE := 7424k
   DEVICE_DTS := EASY88444
-  DEVICE_TITLE := EASY88444 - Lantiq Falcon FTTdp G.FAST Reference Board
 endef
 TARGET_DEVICES += lantiq_easy88444
 
 define Device/lantiq_falcon-sfp
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := Falcon SFP Stick
   IMAGE_SIZE := 7424k
   DEVICE_DTS := FALCON-SFP
-  DEVICE_TITLE := SFP - Lantiq Falcon SFP Stick
 endef
 TARGET_DEVICES += lantiq_falcon-sfp
 
 define Device/lantiq_easy98035synce
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE)
+  DEVICE_VARIANT := with Synchronous Ethernet
   IMAGE_SIZE := 7424k
   DEVICE_DTS := EASY98035SYNCE
-  DEVICE_TITLE := EASY98035SYNCE - Lantiq Falcon SFP Stick with Synchronous Ethernet
 endef
 TARGET_DEVICES += lantiq_easy98035synce
 
 define Device/lantiq_easy98035synce1588
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE1588)
+  DEVICE_VARIANT := with SyncE and IEEE1588
   IMAGE_SIZE := 7424k
   DEVICE_DTS := EASY98035SYNCE1588
-  DEVICE_TITLE := EASY98035SYNCE1588 - Lantiq Falcon SFP Stick with SyncE and IEEE1588
 endef
 TARGET_DEVICES += lantiq_easy98035synce1588
 
 define Device/lantiq_easy98020
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := Falcon SFU Reference Board (EASY98020)
+  DEVICE_VARIANT := v1.0-v1.7
   IMAGE_SIZE := 7424k
   DEVICE_DTS := EASY98020
-  DEVICE_TITLE := EASY98020 - Lantiq Falcon SFU Reference Board
 endef
 TARGET_DEVICES += lantiq_easy98020
 
 define Device/lantiq_easy98020-v18
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := Falcon SFU Reference Board (EASY98020)
+  DEVICE_VARIANT := v1.8
   IMAGE_SIZE := 7424k
   DEVICE_DTS := EASY98020V18
-  DEVICE_TITLE := EASY98020V18 - Lantiq Falcon SFU Reference Board V1.8
 endef
 TARGET_DEVICES += lantiq_easy98020-v18
 
 define Device/lantiq_easy98021
+  DEVICE_VENDOR := Lantiq
+  DEVICE_MODEL := Falcon HGU Reference Board (EASY98021)
   IMAGE_SIZE := 7424k
   DEVICE_DTS := EASY98021
-  DEVICE_TITLE := EASY98021 - Lantiq Falcon HGU Reference Board
 endef
 TARGET_DEVICES += lantiq_easy98021
 
diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index bec9eafbd1..3be40fc947 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -1,6 +1,7 @@
 DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLINK_HVERSION
 
 define Device/lantiqTpLink
+  DEVICE_VENDOR := TP-Link
   TPLINK_HWREVADD := 0
   TPLINK_HVERSION := 2
   KERNEL := kernel-bin | append-dtb | lzma
@@ -13,12 +14,13 @@ endef
 
 define Device/tplink_tdw8970
   $(Device/lantiqTpLink)
+  DEVICE_MODEL := TD-W8970
+  DEVICE_VARIANT := v1
   DEVICE_DTS := TDW8970
   TPLINK_FLASHLAYOUT := 8Mltq
   TPLINK_HWID := 0x89700001
   TPLINK_HWREV := 1
   IMAGE_SIZE := 7680k
-  DEVICE_TITLE := TP-LINK TD-W8970
   DEVICE_PACKAGES:= kmod-ath9k wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   SUPPORTED_DEVICES += TDW8970
 endef
@@ -26,12 +28,13 @@ TARGET_DEVICES += tplink_tdw8970
 
 define Device/tplink_tdw8980
   $(Device/lantiqTpLink)
+  DEVICE_MODEL := TD-W8980
+  DEVICE_VARIANT := v1
   DEVICE_DTS := TDW8980
   TPLINK_FLASHLAYOUT := 8Mltq
   TPLINK_HWID := 0x89800001
   TPLINK_HWREV := 14
   IMAGE_SIZE := 7680k
-  DEVICE_TITLE := TP-LINK TD-W8980
   DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   SUPPORTED_DEVICES += TDW8980
 endef
@@ -39,12 +42,13 @@ TARGET_DEVICES += tplink_tdw8980
 
 define Device/tplink_vr200
   $(Device/lantiqTpLink)
+  DEVICE_MODEL := Archer VR200
+  DEVICE_VARIANT := v1
   DEVICE_DTS := VR200
   TPLINK_FLASHLAYOUT := 16Mltq
   TPLINK_HWID := 0x63e64801
   TPLINK_HWREV := 0x53
   IMAGE_SIZE := 15808k
-  DEVICE_TITLE := TP-LINK Archer VR200
   DEVICE_PACKAGES:= kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   SUPPORTED_DEVICES += VR200
 endef
@@ -52,12 +56,13 @@ TARGET_DEVICES += tplink_vr200
 
 define Device/tplink_vr200v
   $(Device/lantiqTpLink)
+  DEVICE_MODEL := Archer VR200v
+  DEVICE_VARIANT := v1
   DEVICE_DTS := VR200v
   TPLINK_FLASHLAYOUT := 16Mltq
   TPLINK_HWID := 0x73b70801
   TPLINK_HWREV := 0x2f
   IMAGE_SIZE := 15808k
-  DEVICE_TITLE := TP-LINK Archer VR200v
   DEVICE_PACKAGES:= kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VR200v
 endef