lantiq: sync image filename with boardname

Use <manufacturer>_<modelname> as image name.

Use the BOARD_NAME variable to ensure that the former used boardname is
still used as the subdirectory name for the sysupgrade-tar image, to
not break sysupgrade from earlier versions.

While at it, normalise the image filenames by using only lower case
characters and bin as file extension for sysupgrade images.

Signed-off-by: Mathias Kresin <dev@kresin.me>

2 files changed, 227 insertions, 185 deletions

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 71fb6e2315..e643a36475 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -60,10 +60,9 @@ define Device/Default
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
   FILESYSTEMS := squashfs
-  DEVICE_DTS := $(1)
   DEVICE_DTS_DIR := ../dts
   IMAGE_SIZE :=
-  SUPPORTED_DEVICES = $$(DEVICE_DTS)
+  SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
 endef
@@ -97,8 +96,8 @@ DEVICE_VARS += SIGNATURE MAGIC CRC32_POLY
 
 define Device/lantiqFullImage
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma | pad-offset 4 0
-  IMAGES := sysupgrade.bin fullimage.img
-  IMAGE/fullimage.img := fullimage | check-size $$$$(IMAGE_SIZE)
+  IMAGES := sysupgrade.bin fullimage.bin
+  IMAGE/fullimage.bin := fullimage | check-size $$$$(IMAGE_SIZE)
 endef
 
 define Device/AVM
@@ -109,90 +108,94 @@ endef
 
 ifeq ($(SUBTARGET),ase)
 
-define Device/ALL0333CJ
+define Device/allnet_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
-  SUPPORTED_DEVICES := allnet,all0333cj
 endef
-TARGET_DEVICES += ALL0333CJ
+TARGET_DEVICES += allnet_all0333cj
 
-define Device/DGN1000B
+define Device/netgear_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
-  SUPPORTED_DEVICES += netgear,dgn1000b
+  SUPPORTED_DEVICES += DGN1000B
 endef
-TARGET_DEVICES += DGN1000B
+TARGET_DEVICES += netgear_dgn1000b
 
 endif
 
 ifeq ($(SUBTARGET),xway_legacy)
 
-define Device/ARV4520PW
+define Device/arcadyan_arv4520pw
   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 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-rt61-pci wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv4520pw
+  SUPPORTED_DEVICES += ARV4520PW
 endef
-TARGET_DEVICES += ARV4520PW
+TARGET_DEVICES += arcadyan_arv4520pw
 
-define Device/ARV4525PW
+define Device/arcadyan_arv4525pw
   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 \
 	ltq-adsl-app ppp-mod-pppoa -swconfig
-  SUPPORTED_DEVICES += arcadyan,arv4525pw
+  SUPPORTED_DEVICES += ARV4525PW
 endef
-TARGET_DEVICES += ARV4525PW
+TARGET_DEVICES += arcadyan_arv4525pw
 
-define Device/ARV452CQW
+define Device/arcadyan_arv452cqw
   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 \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa
-  SUPPORTED_DEVICES += arcadyan,arv452cqw
+  SUPPORTED_DEVICES += ARV452CQW
 endef
-TARGET_DEVICES += ARV452CQW
+TARGET_DEVICES += arcadyan_arv452cqw
 
-define Device/ARV4518PWR01
+define Device/arcadyan_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 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ath5k wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv4518pwr01
+  SUPPORTED_DEVICES += ARV4518PWR01
 endef
-TARGET_DEVICES += ARV4518PWR01
+TARGET_DEVICES += arcadyan_arv4518pwr01
 
-define Device/ARV4518PWR01A
+define Device/arcadyan_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 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ath5k wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv4518pwr01a
+  SUPPORTED_DEVICES += ARV4518PWR01A
 endef
-TARGET_DEVICES += ARV4518PWR01A
+TARGET_DEVICES += arcadyan_arv4518pwr01a
 
 endif
 
@@ -200,8 +203,10 @@ ifeq ($(SUBTARGET),xway)
 
 # Danube
 
-define Device/BTHOMEHUBV2B
+define Device/bt_homehub-v2b
   $(Device/NAND)
+  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 \
@@ -209,19 +214,20 @@ define Device/BTHOMEHUBV2B
 	kmod-ltq-deu-danube \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ath9k kmod-owl-loader wpad-mini
-  SUPPORTED_DEVICES += bt,homehub-v2b
+  SUPPORTED_DEVICES += BTHOMEHUBV2B
 endef
-TARGET_DEVICES += BTHOMEHUBV2B
+TARGET_DEVICES += bt_homehub-v2b
 
-define Device/EASY50712
+define Device/lantiq_easy50712
+  DEVICE_DTS := EASY50712
   IMAGE_SIZE := 3776k
   DEVICE_TITLE := Lantiq Danube - EASY50712
-  SUPPORTED_DEVICES := lantiq,easy50712
 endef
-TARGET_DEVICES += EASY50712
+TARGET_DEVICES += lantiq_easy50712
 
-define Device/ACMP252
+define Device/audiocodes_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 \
@@ -230,12 +236,13 @@ define Device/ACMP252
 	kmod-rt2800-pci \
 	ltq-adsl-app ppp-mod-pppoa \
 	wpad-mini
-  SUPPORTED_DEVICES += audiocodes,mp-252
+  SUPPORTED_DEVICES += ACMP252
 endef
-TARGET_DEVICES += ACMP252
+TARGET_DEVICES += audiocodes_mp-252
 
-define Device/ARV4510PW
+define Device/arcadyan_arv4510pw
   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 \
@@ -243,45 +250,49 @@ define Device/ARV4510PW
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-tapi kmod-ltq-vmmc \
 	kmod-rt2800-pci kmod-ath5k wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv4510pw
+  SUPPORTED_DEVICES += ARV4510PW
 endef
-TARGET_DEVICES += ARV4510PW
+TARGET_DEVICES += arcadyan_arv4510pw
 
-define Device/ARV7525PW
+define Device/arcadyan_arv7525pw
   IMAGE_SIZE := 3776k
+  DEVICE_DTS := ARV4510PW
   DEVICE_TITLE := Speedport W303V Typ A - ARV7525PW
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini \
 	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 -swconfig
-  SUPPORTED_DEVICES += arcadyan,arv7525pw
+  SUPPORTED_DEVICES += ARV4510PW
 endef
-TARGET_DEVICES += ARV7525PW
+TARGET_DEVICES += arcadyan_arv7525pw
 
-define Device/ARV4519PW
+define Device/arcadyan_arv4519pw
   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 \
 	ltq-adsl-app ppp-mod-pppoa
-  SUPPORTED_DEVICES += arcadyan,arv4519pw
+  SUPPORTED_DEVICES += ARV4519PW
 endef
-TARGET_DEVICES += ARV4519PW
+TARGET_DEVICES += arcadyan_arv4519pw
 
-define Device/ARV7506PW11
+define Device/arcadyan_arv7506pw11
   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 \
 	kmod-rt2800-pci wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv7506pw11
+  SUPPORTED_DEVICES += ARV7506PW11
 endef
-TARGET_DEVICES += ARV7506PW11
+TARGET_DEVICES += arcadyan_arv7506pw11
 
-define Device/ARV7510PW22
+define Device/arcadyan_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 \
@@ -290,36 +301,39 @@ define Device/ARV7510PW22
 	kmod-ltq-tapi kmod-ltq-vmmc \
 	kmod-rt2800-pci wpad-mini \
 	kmod-usb-uhci kmod-usb2 kmod-usb2-pci
-  SUPPORTED_DEVICES += arcadyan,arv7510pw22
+  SUPPORTED_DEVICES += ARV7510PW22
 endef
-TARGET_DEVICES += ARV7510PW22
+TARGET_DEVICES += arcadyan_arv7510pw22
 
-define Device/ARV7518PW
+define Device/arcadyan_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 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ath9k kmod-owl-loader wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv7518pw
+  SUPPORTED_DEVICES += ARV7518PW
 endef
-TARGET_DEVICES += ARV7518PW
+TARGET_DEVICES += arcadyan_arv7518pw
 
-define Device/ARV7519PW
+define Device/arcadyan_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 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-rt2800-pci wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv7519pw
+  SUPPORTED_DEVICES += ARV7519PW
 endef
-TARGET_DEVICES += ARV7519PW
+TARGET_DEVICES += arcadyan_arv7519pw
 
-define Device/ARV752DPW
+define Device/arcadyan_arv752dpw
   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 \
@@ -327,12 +341,13 @@ define Device/ARV752DPW
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-tapi kmod-ltq-vmmc \
 	kmod-rt2800-pci wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv752dpw
+  SUPPORTED_DEVICES += ARV752DPW
 endef
-TARGET_DEVICES += ARV752DPW
+TARGET_DEVICES += arcadyan_arv752dpw
 
-define Device/ARV752DPW22
+define Device/arcadyan_arv752dpw22
   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 \
@@ -340,39 +355,43 @@ define Device/ARV752DPW22
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-tapi kmod-ltq-vmmc \
 	kmod-rt2800-pci wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv752dpw22
+  SUPPORTED_DEVICES += ARV752DPW22
 endef
-TARGET_DEVICES += ARV752DPW22
+TARGET_DEVICES += arcadyan_arv752dpw22
 
-define Device/ARV8539PW22
+define Device/arcadyan_arv8539pw22
   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 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ath9k kmod-owl-loader wpad-mini
-  SUPPORTED_DEVICES += arcadyan,arv8539pw22
+  SUPPORTED_DEVICES += ARV8539PW22
 endef
-TARGET_DEVICES += ARV8539PW22
+TARGET_DEVICES += arcadyan_arv8539pw22
 
-define Device/GIGASX76X
+define Device/siemens_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 \
 	ltq-adsl-app ppp-mod-pppoe \
 	kmod-ath5k wpad-mini
-  SUPPORTED_DEVICES += siemens,gigaset-sx76x
+  SUPPORTED_DEVICES += GIGASX76X
 endef
-TARGET_DEVICES += GIGASX76X
+TARGET_DEVICES += siemens_gigaset-sx76x
 
 
 # AR9
 
-define Device/BTHOMEHUBV3A
+define Device/bt_homehub-v3a
   $(Device/NAND)
+  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 \
@@ -381,13 +400,14 @@ define Device/BTHOMEHUBV3A
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ath9k kmod-owl-loader wpad-mini \
 	uboot-envtools
-  SUPPORTED_DEVICES += bt,homehub-v3a
+  SUPPORTED_DEVICES += BTHOMEHUBV3A
 endef
-TARGET_DEVICES += BTHOMEHUBV3A
+TARGET_DEVICES += bt_homehub-v3a
 
 DGN3500_KERNEL_OFFSET_HEX=0x50000
 DGN3500_KERNEL_OFFSET_DEC=327680
-define Device/DGN3500
+define Device/netgear_dgn3500
+  DEVICE_DTS := DGN3500
   IMAGE_SIZE := 16000k
   IMAGES := \
 	sysupgrade-na.bin sysupgrade.bin \
@@ -413,11 +433,12 @@ define Device/DGN3500
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-deu-ar9
-  SUPPORTED_DEVICES += netgear,dgn3500
+  SUPPORTED_DEVICES += DGN3500
 endef
-TARGET_DEVICES += DGN3500
+TARGET_DEVICES += netgear_dgn3500
 
-define Device/DGN3500B
+define Device/netgear_dgn3500b
+  DEVICE_DTS := DGN3500B
   IMAGE_SIZE := 16000k
   IMAGES += factory.img
   IMAGE/sysupgrade.bin := \
@@ -434,11 +455,11 @@ define Device/DGN3500B
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-deu-ar9
-  SUPPORTED_DEVICES += netgear,dgn3500b
+  SUPPORTED_DEVICES += DGN3500B
 endef
-TARGET_DEVICES += DGN3500B
+TARGET_DEVICES += netgear_dgn3500b
 
-define Device/WBMRA
+define Device/buffalo_wbmr-hp-g300h-a
   IMAGE_SIZE := 31488k
   DEVICE_DTS := WBMR
   DEVICE_TITLE := Buffalo WBMR-HP-G300H (A) - WBMR
@@ -447,11 +468,11 @@ define Device/WBMRA
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ath9k kmod-owl-loader wpad-mini
-  SUPPORTED_DEVICES += buffalo,wbmr-hp-g300h
+  SUPPORTED_DEVICES := WBMRA buffalo,wbmr-hp-g300h
 endef
-TARGET_DEVICES += WBMRA
+TARGET_DEVICES += buffalo_wbmr-hp-g300h-a
 
-define Device/WBMRB
+define Device/buffalo_wbmr-hp-g300h-b
   IMAGE_SIZE := 31488k
   DEVICE_DTS := WBMR
   DEVICE_TITLE := Buffalo WBMR-HP-G300H (B) - WBMR
@@ -460,12 +481,13 @@ define Device/WBMRB
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ath9k kmod-owl-loader wpad-mini
-  SUPPORTED_DEVICES += buffalo,wbmr-hp-g300h
+  SUPPORTED_DEVICES := WBMRB buffalo,wbmr-hp-g300h
 endef
-TARGET_DEVICES += WBMRB
+TARGET_DEVICES += buffalo_wbmr-hp-g300h-b
 
-define Device/FRITZ7320
+define Device/avm_fritz7320
   $(Device/AVM)
+  DEVICE_DTS := FRITZ7320
   IMAGE_SIZE := 15744k
   DEVICE_TITLE := 1&1 HomeServer - FRITZ7320
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-mini \
@@ -473,12 +495,13 @@ define Device/FRITZ7320
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-deu-ar9 kmod-usb-dwc2 -swconfig
-  SUPPORTED_DEVICES += avm,fritz7320
+  SUPPORTED_DEVICES += FRITZ7320
 endef
-TARGET_DEVICES += FRITZ7320
+TARGET_DEVICES += avm_fritz7320
 
-define Device/H201L
+define Device/zte_h201l
   IMAGE_SIZE := 7808k
+  DEVICE_DTS := H201L
   DEVICE_TITLE := ZTE H201L - H201L
   DEVICE_PACKAGES := kmod-ath9k-htc wpad-mini \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
@@ -486,21 +509,22 @@ define Device/H201L
 	ltq-adsl-app ppp-mod-pppoe \
 	kmod-ltq-deu-ar9 kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-tapi kmod-ltq-vmmc
-  SUPPORTED_DEVICES += zte,h201l
+  SUPPORTED_DEVICES += H201L
 endef
-TARGET_DEVICES += H201L
+TARGET_DEVICES += zte_h201l
 
-define Device/P2601HNFX
+define Device/zyxel_p-2601hn
   IMAGE_SIZE := 15616k
+  DEVICE_DTS := P2601HNFX
   DEVICE_TITLE := ZyXEL P-2601HN-Fx
   DEVICE_PACKAGES := kmod-rt2800-usb wpad-mini \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoe \
 	kmod-ltq-deu-ar9 kmod-usb-dwc2
-  SUPPORTED_DEVICES += zyxel,p-2601hn
+  SUPPORTED_DEVICES += P2601HNFX
 endef
-TARGET_DEVICES += P2601HNFX
+TARGET_DEVICES += zyxel_p-2601hn
 
 
 endif
@@ -510,241 +534,257 @@ ifeq ($(SUBTARGET),xrx200)
 
 # VR9
 
-define Device/P2812HNUF1
+define Device/zyxel_p-2812hnu-f1
   $(Device/NAND)
+  BOARD_NAME := P2812HNUF1
+  DEVICE_DTS := P2812HNUF1
   DEVICE_TITLE := ZyXEL P-2812HNU-F1
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += zyxel,p-2812hnu-f1
+  SUPPORTED_DEVICES += P2812HNUF1
 endef
-TARGET_DEVICES += P2812HNUF1
+TARGET_DEVICES += zyxel_p-2812hnu-f1
 
-define Device/P2812HNUF3
+define Device/zyxel_p-2812hnu-f3
   $(Device/NAND)
+  BOARD_NAME := P2812HNUF3
+  DEVICE_DTS := P2812HNUF3
   DEVICE_TITLE := ZyXEL P-2812HNU-F3
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2
-  SUPPORTED_DEVICES += zyxel,p-2812hnu-f3
+  SUPPORTED_DEVICES += P2812HNUF3
 endef
-TARGET_DEVICES += P2812HNUF3
+TARGET_DEVICES += zyxel_p-2812hnu-f3
 
-define Device/ARV7519RW22
+define Device/arcadyan_arv7519rw22
   IMAGE_SIZE := 31232k
+  DEVICE_DTS := ARV7519RW22
   DEVICE_TITLE := Livebox Astoria ARV7519RW22
   DEVICE_PACKAGES := kmod-usb-dwc2
-  SUPPORTED_DEVICES += arcadyan,arv7519rw22
+  SUPPORTED_DEVICES += ARV7519RW22
 endef
-TARGET_DEVICES += ARV7519RW22
+TARGET_DEVICES += arcadyan_arv7519rw22
 
-define Device/ASL56026
+define Device/alphanetworks_asl56026
+  DEVICE_DTS := ASL56026
   IMAGE_SIZE := 7488k
   DEVICE_TITLE := BT OpenReach - ECI VDSL Modem V-2FUb/I
-  SUPPORTED_DEVICES := alphanetworks,asl56026
 endef
-TARGET_DEVICES += ASL56026
+TARGET_DEVICES += alphanetworks_asl56026
 
-define Device/BTHOMEHUBV5A
+define Device/bt_homehub-v5a
   $(Device/NAND)
+  BOARD_NAME := BTHOMEHUBV5A
+  DEVICE_DTS := BTHOMEHUBV5A
   DEVICE_TITLE := BT Home Hub 5A
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \
 	kmod-ath10k ath10k-firmware-qca988x wpad-mini kmod-usb-dwc2
-  SUPPORTED_DEVICES += bt,homehub-v5a
+  SUPPORTED_DEVICES += BTHOMEHUBV5A
 endef
-TARGET_DEVICES += BTHOMEHUBV5A
+TARGET_DEVICES += bt_homehub-v5a
 
-define Device/DM200
+define Device/netgear_dm200
+  DEVICE_DTS := DM200
   IMAGES := sysupgrade.bin factory.img
   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
-  SUPPORTED_DEVICES := netgear,dm200
 endef
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
-TARGET_DEVICES += DM200
+TARGET_DEVICES += netgear_dm200
 
-define Device/EASY80920NAND
+define Device/lantiq_easy80920-nand
   $(Device/lantiqFullImage)
+  DEVICE_DTS := EASY80920NAND
   IMAGE_SIZE := 64512k
   DEVICE_TITLE := Lantiq VR9 - EASY80920NAND
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES := lantiq,easy80920-nand
 endef
-TARGET_DEVICES += EASY80920NAND
+TARGET_DEVICES += lantiq_easy80920-nand
 
-define Device/EASY80920NOR
+define Device/lantiq_easy80920-nor
+  DEVICE_DTS := EASY80920NOR
   IMAGE_SIZE := 7936k
   DEVICE_TITLE := Lantiq VR9 - EASY80920NOR
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES := lantiq,easy80920-nor
 endef
-TARGET_DEVICES += EASY80920NOR
+TARGET_DEVICES += lantiq_easy80920-nor
 
-define Device/FRITZ3370
+define Device/avm_fritz3370
   $(Device/AVM)
   $(Device/NAND)
+  BOARD_NAME := FRITZ3370
+  DEVICE_DTS := FRITZ3370
   DEVICE_TITLE := Fritz!Box WLan - FRITZ3370
   DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
-  SUPPORTED_DEVICES += avm,fritz3370
+  SUPPORTED_DEVICES += FRITZ3370
 endef
-TARGET_DEVICES += FRITZ3370
+TARGET_DEVICES += avm_fritz3370
 
-define Device/FRITZ7360SL
+define Device/avm_fritz7360sl
   $(Device/AVM)
   IMAGE_SIZE := 15744k
+  DEVICE_DTS := FRITZ7360SL
   DEVICE_TITLE := 1&1 HomeServer - FRITZ7360SL
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-mini kmod-usb-dwc2
-  SUPPORTED_DEVICES += avm,fritz7360sl
+  SUPPORTED_DEVICES += FRITZ7360SL
 endef
-TARGET_DEVICES += FRITZ7360SL
+TARGET_DEVICES += avm_fritz7360sl
 
-define Device/VG3503J
+define Device/arcadyan_vg3503j
   IMAGE_SIZE := 8000k
+  DEVICE_DTS := VG3503J
   DEVICE_TITLE := BT OpenReach - ECI VDSL Modem V-2FUb/R
-  SUPPORTED_DEVICES += arcadyan,vg3503j
+  SUPPORTED_DEVICES += VG3503J
 endef
-TARGET_DEVICES += VG3503J
+TARGET_DEVICES += arcadyan_vg3503j
 
 include tp-link.mk
 
-define Device/WBMR300
+define Device/buffalo_wbmr-300hpd
   IMAGE_SIZE := 15616k
+  DEVICE_DTS := WBMR300
   DEVICE_TITLE := Buffalo WBMR-300HPD
   DEVICE_PACKAGES := kmod-mt7603 wpad-mini kmod-usb-dwc2
-  SUPPORTED_DEVICES += buffalo,wbmr-300hpd
+  SUPPORTED_DEVICES += WBMR300
 endef
-TARGET_DEVICES += WBMR300
+TARGET_DEVICES += buffalo_wbmr-300hpd
 
-define Device/VGV7510KW22NOR
+define Device/arcadyan_vgv7510kw22-nor
   IMAGE_SIZE := 15232k
+  DEVICE_DTS := VGV7510KW22NOR
   DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (NOR)
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
-  SUPPORTED_DEVICES += arcadyan,vgv7510kw22-nor
+  SUPPORTED_DEVICES += VGV7510KW22NOR
 endef
-TARGET_DEVICES += VGV7510KW22NOR
+TARGET_DEVICES += arcadyan_vgv7510kw22-nor
 
-define Device/VGV7510KW22BRN
+define Device/arcadyan_vgv7510kw22-brn
   $(Device/lantiqBrnImage)
   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-mini kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
-  SUPPORTED_DEVICES += arcadyan,vgv7510kw22-brn
+  SUPPORTED_DEVICES += VGV7510KW22BRN
 endef
-TARGET_DEVICES += VGV7510KW22BRN
+TARGET_DEVICES += arcadyan_vgv7510kw22-brn
 
-define Device/VGV7519NOR
+define Device/arcadyan_vgv7519-nor
   IMAGE_SIZE := 15360k
+  DEVICE_DTS := VGV7519NOR
   DEVICE_TITLE := Experiabox 8 VGV7519
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
-  SUPPORTED_DEVICES += arcadyan,vgv7519-nor
+  SUPPORTED_DEVICES += VGV7519NOR
 endef
-TARGET_DEVICES += VGV7519NOR
+TARGET_DEVICES += arcadyan_vgv7519-nor
 
-define Device/VGV7519BRN
+define Device/arcadyan_vgv7519-brn
   $(Device/lantiqBrnImage)
   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-mini kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
-  SUPPORTED_DEVICES += arcadyan,vgv7519-brn
+  SUPPORTED_DEVICES += VGV7519BRN
 endef
-TARGET_DEVICES += VGV7519BRN
+TARGET_DEVICES += arcadyan_vgv7519-brn
 
 endif
 
 
 ifeq ($(SUBTARGET),falcon)
 
-define Device/EASY98000NOR
+define Device/lantiq_easy98000-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
-  SUPPORTED_DEVICES := lantiq,easy98000-nor
 endef
-TARGET_DEVICES += EASY98000NOR
+TARGET_DEVICES += lantiq_easy98000-nor
 
-define Device/EASY98000NAND
+define Device/lantiq_easy98000-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
-  SUPPORTED_DEVICES := lantiq,easy98000-nand
 endef
-TARGET_DEVICES += EASY98000NAND
+TARGET_DEVICES += lantiq_easy98000-nand
 
-define Device/EASY98000SFLASH
+define Device/lantiq_easy98000-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
-  SUPPORTED_DEVICES := lantiq,easy98000-sflash
 endef
-TARGET_DEVICES += EASY98000SFLASH
+TARGET_DEVICES += lantiq_easy98000-sflash
 
-define Device/FALCON-MDU
+define Device/lantiq_falcon-mdu
   IMAGE_SIZE := 7424k
+  DEVICE_DTS := FALCON-MDU
   DEVICE_TITLE := MDU - Lantiq Falcon / VINAXdp MDU Board
-  SUPPORTED_DEVICES := lantiq,falcon-mdu
 endef
-TARGET_DEVICES += FALCON-MDU
+TARGET_DEVICES += lantiq_falcon-mdu
 
-define Device/EASY88388
+define Device/lantiq_easy88388
   IMAGE_SIZE := 7424k
+  DEVICE_DTS := EASY88388
   DEVICE_TITLE := EASY88388 - Lantiq Falcon FTTDP8 Reference Board
-  SUPPORTED_DEVICES := lantiq,easy88388
 endef
-TARGET_DEVICES += EASY88388
+TARGET_DEVICES += lantiq_easy88388
 
-define Device/EASY88444
+define Device/lantiq_easy88444
   IMAGE_SIZE := 7424k
+  DEVICE_DTS := EASY88444
   DEVICE_TITLE := EASY88444 - Lantiq Falcon FTTdp G.FAST Reference Board
-  SUPPORTED_DEVICES := lantiq,easy88444
 endef
-TARGET_DEVICES += EASY88444
+TARGET_DEVICES += lantiq_easy88444
 
-define Device/FALCON-SFP
+define Device/lantiq_falcon-sfp
   IMAGE_SIZE := 7424k
+  DEVICE_DTS := FALCON-SFP
   DEVICE_TITLE := SFP - Lantiq Falcon SFP Stick
-  SUPPORTED_DEVICES := lantiq,falcon-sfp
 endef
-TARGET_DEVICES += FALCON-SFP
+TARGET_DEVICES += lantiq_falcon-sfp
 
-define Device/EASY98035SYNCE
+define Device/lantiq_easy98035synce
   IMAGE_SIZE := 7424k
+  DEVICE_DTS := EASY98035SYNCE
   DEVICE_TITLE := EASY98035SYNCE - Lantiq Falcon SFP Stick with Synchronous Ethernet
-  SUPPORTED_DEVICES := lantiq,easy98035synce
 endef
-TARGET_DEVICES += EASY98035SYNCE
+TARGET_DEVICES += lantiq_easy98035synce
 
-define Device/EASY98035SYNCE1588
+define Device/lantiq_easy98035synce1588
   IMAGE_SIZE := 7424k
+  DEVICE_DTS := EASY98035SYNCE1588
   DEVICE_TITLE := EASY98035SYNCE1588 - Lantiq Falcon SFP Stick with SyncE and IEEE1588
-  SUPPORTED_DEVICES := lantiq,easy98035synce1588
 endef
-TARGET_DEVICES += EASY98035SYNCE1588
+TARGET_DEVICES += lantiq_easy98035synce1588
 
-define Device/EASY98020
+define Device/lantiq_easy98020
   IMAGE_SIZE := 7424k
+  DEVICE_DTS := EASY98020
   DEVICE_TITLE := EASY98020 - Lantiq Falcon SFU Reference Board
-  SUPPORTED_DEVICES := lantiq,easy98020
 endef
-TARGET_DEVICES += EASY98020
+TARGET_DEVICES += lantiq_easy98020
 
-define Device/EASY98020V18
+define Device/lantiq_easy98020-v18
   IMAGE_SIZE := 7424k
+  DEVICE_DTS := EASY98020V18
   DEVICE_TITLE := EASY98020V18 - Lantiq Falcon SFU Reference Board V1.8
-  SUPPORTED_DEVICES := lantiq,easy98020-v18
 endef
-TARGET_DEVICES += EASY98020V18
+TARGET_DEVICES += lantiq_easy98020-v18
 
-define Device/EASY98021
+define Device/lantiq_easy98021
   IMAGE_SIZE := 7424k
+  DEVICE_DTS := EASY98021
   DEVICE_TITLE := EASY98021 - Lantiq Falcon HGU Reference Board
-  SUPPORTED_DEVICES := lantiq,easy98021
 endef
-TARGET_DEVICES += EASY98021
+TARGET_DEVICES += lantiq_easy98021
 
 endif
 
diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index c5e1c72efc..561d390d8c 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -11,32 +11,35 @@ define Device/lantiqTpLink
 	append-metadata | check-size $$$$(IMAGE_SIZE)
 endef
 
-define Device/TDW8970
+define Device/tplink_tdw8970
   $(Device/lantiqTpLink)
+  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-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += tplink,tdw8970
+  SUPPORTED_DEVICES += TDW8970
 endef
-TARGET_DEVICES += TDW8970
+TARGET_DEVICES += tplink_tdw8970
 
-define Device/TDW8980
+define Device/tplink_tdw8980
   $(Device/lantiqTpLink)
+  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-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += tplink,tdw8980
+  SUPPORTED_DEVICES += TDW8980
 endef
-TARGET_DEVICES += TDW8980
+TARGET_DEVICES += tplink_tdw8980
 
-define Device/VR200v
+define Device/tplink_vr200v
   $(Device/lantiqTpLink)
+  DEVICE_DTS := VR200v
   TPLINK_BOARD_ID := ArcherVR200V
   TPLINK_FLASHLAYOUT := 16Mltq
   TPLINK_HWID := 0x73b70801
@@ -44,7 +47,6 @@ define Device/VR200v
   IMAGE_SIZE := 15808k
   DEVICE_TITLE := TP-LINK Archer VR200v
   DEVICE_PACKAGES:= kmod-usb-dwc2 kmod-usb-ledtrig-usbport
-  SUPPORTED_DEVICES += tplink,vr200v
+  SUPPORTED_DEVICES += VR200v
 endef
-TARGET_DEVICES += VR200v
-
+TARGET_DEVICES += tplink_vr200v