lantiq: un-macro the image building code

Signed-off-by: John Crispin <john@phrozen.org>

16 files changed, 394 insertions, 382 deletions

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index bd2abd9fd1..a601d38c11 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -281,45 +281,7 @@ define Device/lantiqBrnImage
 endef
 DEVICE_VARS += SIGNATURE MAGIC CRC32_POLY
 
-define lantiqImage
-  define Device/$(1)
-    $$(Device/lantiqImage)
-    DEVICE_PROFILE := $(1)
-    IMAGE_SIZE := $(2)
-    DEVICE_DTS := $(if $(3),$(3),$(1))
-  endef
-  TARGET_DEVICES += $(1)
-endef
-
-define lantiqBrnImage
-  define Device/$(1)
-    $$(Device/lantiqBrnImage)
-    DEVICE_PROFILE := $(1)
-    DEVICE_DTS := $(1)
-    IMAGE_SIZE := $(2)
-    SIGNATURE := $(3)
-    MAGIC := $(4)
-    CRC32_POLY := $(5)
-  endef
-  TARGET_DEVICES += $(1)
-endef
-
-ifeq ($(CONFIG_TARGET_lantiq_falcon),y)
-
-$(eval $(call lantiqImage,EASY98000NOR))
-$(eval $(call lantiqImage,EASY98000SFLASH))
-
-endif
-
-
-ifeq ($(CONFIG_TARGET_lantiq_ase),y)
-
-$(eval $(call lantiqImage,DGN1000B,3392k))
-
-endif
-
-
-ifeq ($(CONFIG_TARGET_lantiq_xway),y)
+ifeq ($(SUBTARGET),xway)
 
 # Danube
 BTHOMEHUBV2B_UBIFS_OPTS:="-m 512 -e 15872 -c 1959"
@@ -328,23 +290,236 @@ BTHOMEHUBV2B_UBI_OPTS:="-m 512 -p 16KiB -s 256"
 Image/BuildKernel/Profile/BTHOMEHUBV2B=$(call Image/BuildKernel/Template,BTHOMEHUBV2B)
 Image/Build/Profile/BTHOMEHUBV2B=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV2B)
 
-$(eval $(call lantiqImage,EASY50712,3776k))
-$(eval $(call lantiqImage,ACMP252,14848k))
-$(eval $(call lantiqImage,ARV4510PW,15616k))
-$(eval $(call lantiqImage,ARV4525PW,3776k))
-$(eval $(call lantiqImage,ARV7525PW,3776k))
-$(eval $(call lantiqImage,ARV4518PWR01,3776k))
-$(eval $(call lantiqImage,ARV4518PWR01A,3776k))
-$(eval $(call lantiqImage,ARV4519PW,3776k))
-$(eval $(call lantiqImage,ARV4520PW,3648k))
-$(eval $(call lantiqImage,ARV452CQW,3776k))
-$(eval $(call lantiqImage,ARV7510PW22,31232k))
-$(eval $(call lantiqImage,ARV7518PW,7872k))
-$(eval $(call lantiqImage,ARV7519PW,15488k))
-$(eval $(call lantiqImage,ARV752DPW,7872k))
-$(eval $(call lantiqImage,ARV752DPW22,7616k))
-$(eval $(call lantiqImage,ARV8539PW22,7616k))
-$(eval $(call lantiqImage,GIGASX76X,7680k))
+define Device/EASY50712
+  DEVICE_PROFILE := EASY50712
+  IMAGE_SIZE := 3776k
+  DEVICE_DTS := EASY50712
+  DEVICE_TITLE := Lantiq Danube - EASY50712
+endef
+TARGET_DEVICES += EASY50712
+
+define Device/ACMP252
+  DEVICE_PROFILE := ACMP252
+  IMAGE_SIZE := 14848k
+  DEVICE_DTS := ACMP252
+  DEVICE_TITLE := AudioCodes MediaPack MP-252
+  DEVICE_PACKAGES := kmod-rt2x00-pci wpad-mini \
+	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
+	kmod-ltq-adsl-danube-fw-a kmod-ltq-ptm-danube \
+	ltq-adsl-app
+endef
+TARGET_DEVICES += ACMP252
+
+define Device/ARV4510PW
+  DEVICE_PROFILE := ARV4510PW
+  IMAGE_SIZE := 15616k
+  DEVICE_DTS := ARV4510PW
+  DEVICE_TITLE := Wippies, Elisa - ARV4510PW
+  DEVICE_PACKAGES := kmod-ledtrig-usbdev 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 \
+	ltq-adsl-app ppp-mod-pppoa \
+	kmod-ltq-tapi kmod-ltq-vmmc \
+	kmod-rt2800-pci kmod-ath5k wpad-mini \
+	swconfig
+endef
+TARGET_DEVICES += ARV4510PW
+
+define Device/ARV4525PW
+  DEVICE_PROFILE := 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
+endef
+TARGET_DEVICES += ARV4525PW
+
+define Device/ARV7525PW
+  DEVICE_PROFILE := ARV7525PW
+  IMAGE_SIZE := 3776k
+  DEVICE_DTS := ARV7525PW
+  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
+endef
+TARGET_DEVICES += ARV7525PW
+
+define Device/ARV4518PWR01
+  DEVICE_PROFILE := ARV4518PWR01
+  IMAGE_SIZE := 3776k
+  DEVICE_DTS := ARV4518PWR01
+  DEVICE_TITLE := ARV4518PWR01
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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 \
+	swconfig
+endef
+TARGET_DEVICES += ARV4518PWR01
+
+define Device/ARV4518PWR01A
+  DEVICE_PROFILE := ARV4518PWR01A
+  IMAGE_SIZE := 3776k
+  DEVICE_DTS := ARV4518PWR01A
+  DEVICE_TITLE := ARV4518PWR01A
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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 \
+	swconfig
+endef
+TARGET_DEVICES += ARV4518PWR01A
+
+define Device/ARV4519PW
+  DEVICE_PROFILE := ARV4519PW
+  IMAGE_SIZE := 3776k
+  DEVICE_DTS := ARV4519PW
+  DEVICE_TITLE := Vodafone, Pirelli - ARV4519PW
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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 \
+	swconfig
+endef
+TARGET_DEVICES += ARV4519PW
+
+define Device/ARV4520PW
+  DEVICE_PROFILE := ARV4520PW
+  IMAGE_SIZE := 3648k
+  DEVICE_DTS := ARV4520PW
+  DEVICE_TITLE := Easybox 800, WAV-281 - ARV4520PW
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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 \
+	swconfig
+endef
+TARGET_DEVICES += ARV4520PW
+
+define Device/ARV452CQW
+  DEVICE_PROFILE := ARV452CQW
+  IMAGE_SIZE := 3776k
+  DEVICE_DTS := ARV452CQW
+  DEVICE_TITLE := Easybox 801 - ARV452CQW
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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
+endef
+TARGET_DEVICES += ARV452CQW
+
+define Device/ARV7510PW22
+  DEVICE_PROFILE := ARV7510PW22
+  IMAGE_SIZE := 31232k
+  DEVICE_DTS := ARV7510PW22
+  DEVICE_TITLE := Astoria - ARV7510PW22
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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-ltq-tapi kmod-ltq-vmmc \
+	kmod-rt2800-pci wpad-mini \
+	kmod-usb-uhci kmod-usb2 kmod-usb2-pci \
+	swconfig
+endef
+TARGET_DEVICES += ARV7510PW22
+
+define Device/ARV7518PW
+  DEVICE_PROFILE := ARV7518PW
+  IMAGE_SIZE := 7872k
+  DEVICE_DTS := ARV7518PW
+  DEVICE_TITLE := Astoria - ARV7518PW
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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 wpad-mini \
+	swconfig
+endef
+TARGET_DEVICES += ARV7518PW
+
+define Device/ARV7519PW
+  DEVICE_PROFILE := ARV7519PW
+  IMAGE_SIZE := 15488k
+  DEVICE_DTS := ARV7519PW
+  DEVICE_TITLE := Astoria - ARV7519PW
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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 \
+	swconfig
+endef
+TARGET_DEVICES += ARV7519PW
+
+define Device/ARV752DPW
+  DEVICE_PROFILE := ARV752DPW
+  IMAGE_SIZE := 7872k
+  DEVICE_DTS := ARV752DPW
+  DEVICE_TITLE := Easybox 802 - ARV752DPW
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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-ltq-tapi kmod-ltq-vmmc \
+	kmod-rt2800-pci wpad-mini \
+	swconfig
+endef
+TARGET_DEVICES += ARV752DPW
+
+define Device/ARV752DPW22
+  DEVICE_PROFILE := ARV752DPW22
+  IMAGE_SIZE := 7616k
+  DEVICE_DTS := ARV752DPW22
+  DEVICE_TITLE := Easybox 803 - ARV752DPW22
+  DEVICE_PACKAGES := kmod-usb2-pci kmod-usb-uhci kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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-ltq-tapi kmod-ltq-vmmc \
+	kmod-rt2800-pci wpad-mini \
+	swconfig
+endef
+TARGET_DEVICES += ARV752DPW22
+
+define Device/ARV8539PW22
+  DEVICE_PROFILE := ARV8539PW22
+  IMAGE_SIZE := 7616k
+  DEVICE_DTS := ARV8539PW22
+  DEVICE_TITLE := Speedport W504V Typ A - ARV8539PW22
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube \
+	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 wpad-mini \
+	swconfig
+endef
+TARGET_DEVICES += ARV8539PW22
+
+define Device/GIGASX76X
+  DEVICE_PROFILE := GIGASX76X
+  IMAGE_SIZE := 7680k
+  DEVICE_DTS := GIGASX76X
+  DEVICE_TITLE := Gigaset sx76x
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
+	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 \
+	swconfig
+endef
+TARGET_DEVICES += GIGASX76X
+
 
 
 # AR9
@@ -360,20 +535,81 @@ Image/Build/Profile/DGN3500=$(call Image/BuildDGN3500/$(1),$(1),DGN3500)
 Image/BuildKernel/Profile/DGN3500B=$(call Image/BuildKernel/Template,DGN3500B)
 Image/Build/Profile/DGN3500B=$(call Image/BuildDGN3500B/$(1),$(1),DGN3500B)
 
-$(eval $(call lantiqImage,WBMRA,31488k,WBMR))
-$(eval $(call lantiqImage,WBMRB,31488k,WBMR))
+define Device/WBMRA
+  DEVICE_PROFILE := WBMRA
+  IMAGE_SIZE := 31488k
+  DEVICE_DTS := WBMR
+  DEVICE_TITLE := Buffalo WBMR-HP-G300H (A) - WBMR
+  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ledtrig-usbdev \
+	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
+	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
+	ltq-adsl-app ppp-mod-pppoa \
+	kmod-ath9k wpad hostapd-utils \
+	swconfig
+endef
+TARGET_DEVICES += WBMRA
+
+define Device/WBMRB
+  DEVICE_PROFILE := WBMRB
+  IMAGE_SIZE := 31488k
+  DEVICE_DTS := WBMR
+  DEVICE_TITLE := Buffalo WBMR-HP-G300H (B) - WBMR
+  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ledtrig-usbdev \
+	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
+	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
+	ltq-adsl-app ppp-mod-pppoa \
+	kmod-ath9k wpad hostapd-utils \
+	swconfig
+endef
+TARGET_DEVICES += WBMRB
+
 
 Image/BuildKernel/Profile/FRITZ7320=$(call Image/BuildKernelEVA/Template,FRITZ7320)
 Image/Build/Profile/FRITZ7320=$(call Image/BuildEVA/$(1),$(1),FRITZ7320)
 
-$(eval $(call lantiqImage,GR7000,7808k))
-$(eval $(call lantiqImage,H201L,7808k))
-$(eval $(call lantiqImage,P2601HNFX,15616k))
+define Device/GR7000
+  DEVICE_PROFILE := GR7000
+  IMAGE_SIZE := 7808k
+  DEVICE_DTS := GR7000
+  DEVICE_TITLE := Aztech GR7000
+  DEVICE_PACKAGES := kmod-ltq-deu-ar9 kmod-usb-dwc2 swconfig
+endef
+TARGET_DEVICES += GR7000
+
+define Device/H201L
+  DEVICE_PROFILE := 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 \
+	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
+	ltq-adsl-app ppp-mod-pppoe \
+	kmod-ltq-deu-ar9 kmod-usb-dwc2 \
+	kmod-ltq-tapi kmod-ltq-vmmc \
+	swconfig
+endef
+TARGET_DEVICES += H201L
+
+define Device/P2601HNFX
+  DEVICE_PROFILE := P2601HNFX
+  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 \
+	swconfig
+endef
+TARGET_DEVICES += P2601HNFX
+
 
 endif
 
 
-ifeq ($(CONFIG_TARGET_lantiq_xrx200),y)
+ifeq ($(SUBTARGET),xrx200)
 
 # VR9
 P2812HNUF1_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
@@ -388,7 +624,15 @@ P2812HNUF3_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
 Image/BuildKernel/Profile/P2812HNUF3=$(call Image/BuildKernel/Template,P2812HNUF3)
 Image/Build/Profile/P2812HNUF3=$(call Image/BuildNAND/$(1),$(1),P2812HNUF3)
 
-$(eval $(call lantiqImage,ARV7519RW22,31232k))
+define Device/ARV7519RW22
+  DEVICE_PROFILE := ARV7519RW22
+  IMAGE_SIZE := 31232k
+  DEVICE_DTS := ARV7519RW22
+  DEVICE_TITLE := Livebox Astoria ARV7519RW22
+  DEVICE_PACKAGES := kmod-usb-dwc2
+endef
+TARGET_DEVICES += ARV7519RW22
+
 
 BTHOMEHUBV5A_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
 BTHOMEHUBV5A_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
@@ -396,8 +640,24 @@ BTHOMEHUBV5A_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
 Image/BuildKernel/Profile/BTHOMEHUBV5A=$(call Image/BuildKernel/Template,BTHOMEHUBV5A)
 Image/Build/Profile/BTHOMEHUBV5A=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV5A)
 
-$(eval $(call lantiqImage,EASY80920NAND,64512k))
-$(eval $(call lantiqImage,EASY80920NOR,7936k))
+define Device/EASY80920NAND
+  DEVICE_PROFILE := EASY80920NAND
+  IMAGE_SIZE := 64512k
+  DEVICE_DTS := EASY80920NAND
+  DEVICE_TITLE := Lantiq VR9 - EASY80920NAND
+  DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += EASY80920NAND
+
+define Device/EASY80920NOR
+  DEVICE_PROFILE := EASY80920NOR
+  IMAGE_SIZE := 7936k
+  DEVICE_DTS := EASY80920NOR
+  DEVICE_TITLE := Lantiq VR9 - EASY80920NOR
+  DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += EASY80920NOR
+
 
 FRITZ3370_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
 FRITZ3370_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
@@ -410,10 +670,49 @@ Image/Build/Profile/VG3503J=$(call Image/BuildLoader/$(1),$(1),VG3503J)
 
 include tp-link.mk
 
-$(eval $(call lantiqImage,VGV7510KW22NOR,15232k))
-$(eval $(call lantiqBrnImage,VGV7510KW22BRN,6784k,BRNDA6431,0x12345678,0x04c11db7))
-$(eval $(call lantiqImage,VGV7519NOR,15360k))
-$(eval $(call lantiqBrnImage,VGV7519BRN,7168k,5D00008000,0x12345678,0x2083b8ed))
+define Device/VGV7510KW22NOR
+  DEVICE_PROFILE := VGV7510KW22NOR
+  IMAGE_SIZE := 15232k
+  DEVICE_DTS := VGV7510KW22NOR
+  DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (NOR)
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += VGV7510KW22NOR
+
+define Device/VGV7510KW22BRN
+  $(Device/lantiqBrnImage)
+  DEVICE_PROFILE := VGV7510KW22BRN
+  DEVICE_DTS := VGV7510KW22BRN
+  IMAGE_SIZE := 7168k
+  SIGNATURE := 5D00008000
+  MAGIC := 0x12345678
+  CRC32_POLY := 0x2083b8ed
+  DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (BRN)
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += VGV7510KW22BRN
+
+define Device/VGV7519NOR
+  DEVICE_PROFILE := VGV7519NOR
+  IMAGE_SIZE := 15360k
+  DEVICE_DTS := VGV7519NOR
+  DEVICE_TITLE := Experiabox 8 VGV7519
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += VGV7519NOR
+
+define Device/VGV7519BRN
+  $(Device/lantiqBrnImage)
+  DEVICE_PROFILE := VGV7519BRN
+  DEVICE_DTS := VGV7519BRN
+  IMAGE_SIZE := 7168k
+  SIGNATURE := 5D00008000
+  MAGIC := 0x12345678
+  CRC32_POLY := 0x2083b8ed
+  DEVICE_TITLE := Experiabox 8 VGV7519 (BRN)
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += VGV7519BRN
 
 define Image/Prepare
 	$(call Image/Prepare/Profile,$(PROFILE))
@@ -421,7 +720,6 @@ endef
 
 endif
 
-
 define Image/BuildKernel
 	$(call Image/BuildKernel/Profile/$(PROFILE))
 endef
diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index 5cb3169393..bce617eb51 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -24,6 +24,8 @@ define Device/TDW8970
   DEVICE_DTS = $(DEVICE_PROFILE)
   BOARD_ID := TD-W8970v1
   IMAGE_SIZE := 7680k
+  DEVICE_TITLE := TP-LINK TD-W8970
+  DEVICE_PACKAGES:= kmod-ath9k wpad-mini kmod-usb-dwc2 kmod-ledtrig-usbdev
 endef
 
 define Device/TDW8980
@@ -32,6 +34,8 @@ define Device/TDW8980
   DEVICE_DTS = $(DEVICE_PROFILE)
   BOARD_ID := TD-W8980v1
   IMAGE_SIZE := 7680k
+  DEVICE_TITLE := TP-LINK TD-W8980
+  DEVICE_PACKAGES:= kmod-ath9k wpad-mini kmod-usb-dwc2 kmod-ledtrig-usbdev
 endef
 
 define Device/VR200v
@@ -40,6 +44,8 @@ define Device/VR200v
   DEVICE_DTS = $(DEVICE_PROFILE)
   BOARD_ID := ArcherVR200V
   IMAGE_SIZE := 15808k
+  DEVICE_TITLE := TP-LINK Archer VR200v
+  DEVICE_PACKAGES:= kmod-usb-dwc2 kmod-ledtrig-usbdev
 endef
 TARGET_DEVICES += TDW8970 TDW8980 VR200v
 
diff --git a/target/linux/lantiq/xrx200/profiles/00-default.mk b/target/linux/lantiq/xrx200/profiles/00-default.mk
new file mode 100644
index 0000000000..26bc8b502b
--- /dev/null
+++ b/target/linux/lantiq/xrx200/profiles/00-default.mk
@@ -0,0 +1,9 @@
+define Profile/Default
+	NAME:=Default Profile
+	PRIORITY:=1
+endef
+
+define Profile/Default/Description
+	Default package set compatible with most boards.
+endef
+$(eval $(call Profile,Default))
diff --git a/target/linux/lantiq/xrx200/profiles/arv.mk b/target/linux/lantiq/xrx200/profiles/arv.mk
index dda57309d9..3f233aaa3f 100644
--- a/target/linux/lantiq/xrx200/profiles/arv.mk
+++ b/target/linux/lantiq/xrx200/profiles/arv.mk
@@ -3,38 +3,3 @@ define Profile/VG3503J
 endef
 
 $(eval $(call Profile,VG3503J))
-
-define Profile/VGV7510KW22NOR
-  NAME:=o2 Box 6431 / Arcadyan VGV7510KW22 (NOR)
-  PACKAGES:=kmod-rt2800-pci wpad-mini kmod-usb-dwc2
-endef
-
-$(eval $(call Profile,VGV7510KW22NOR))
-
-define Profile/VGV7510KW22BRN
-  NAME:=o2 Box 6431 / Arcadyan VGV7510KW22 (BRN)
-  PACKAGES:=kmod-rt2800-pci wpad-mini kmod-usb-dwc2
-endef
-
-$(eval $(call Profile,VGV7510KW22BRN))
-
-define Profile/VGV7519NOR
-  NAME:=Experiabox 8 VGV7519
-  PACKAGES:=kmod-rt2800-pci wpad-mini kmod-usb-dwc2
-endef
-
-$(eval $(call Profile,VGV7519NOR))
-
-define Profile/VGV7519BRN
-  NAME:=Experiabox 8 VGV7519 (BRN)
-  PACKAGES:=kmod-rt2800-pci wpad-mini kmod-usb-dwc2
-endef
-
-$(eval $(call Profile,VGV7519BRN))
-
-define Profile/ARV7519RW22
-  NAME:=Livebox Astoria ARV7519RW22
-  PACKAGES:=kmod-usb-dwc2
-endef
-
-$(eval $(call Profile,ARV7519RW22))
diff --git a/target/linux/lantiq/xrx200/profiles/lantiq.mk b/target/linux/lantiq/xrx200/profiles/lantiq.mk
deleted file mode 100644
index 39c3bc6051..0000000000
--- a/target/linux/lantiq/xrx200/profiles/lantiq.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-define Profile/EASY80920NOR
-  NAME:=Lantiq VR9 - EASY80920NOR
-  PACKAGES:=kmod-ath9k wpad-mini kmod-usb-dwc2 dsl-vrx200-firmware-xdsl-a dsl-vrx200-firmware-xdsl-b-patch
-endef
-
-$(eval $(call Profile,EASY80920NOR))
-
-define Profile/EASY80920NAND
-  NAME:=Lantiq VR9 - EASY80920NAND
-  PACKAGES:=kmod-ath9k wpad-mini kmod-usb-dwc2 dsl-vrx200-firmware-xdsl-a dsl-vrx200-firmware-xdsl-b-patch
-endef
-
-$(eval $(call Profile,EASY80920NAND))
diff --git a/target/linux/lantiq/xrx200/profiles/tplink.mk b/target/linux/lantiq/xrx200/profiles/tplink.mk
deleted file mode 100644
index 2ac364e3fb..0000000000
--- a/target/linux/lantiq/xrx200/profiles/tplink.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-define Profile/TDW8970
-  NAME:=TP-LINK TD-W8970
-  PACKAGES:=kmod-ath9k wpad-mini kmod-usb-dwc2 kmod-ledtrig-usbdev dsl-vrx200-firmware-xdsl-a dsl-vrx200-firmware-xdsl-b-patch
-endef
-
-$(eval $(call Profile,TDW8970))
-
-define Profile/TDW8980
-  NAME:=TP-LINK TD-W8980
-  PACKAGES:=kmod-ath9k wpad-mini kmod-usb-dwc2 kmod-ledtrig-usbdev dsl-vrx200-firmware-xdsl-a dsl-vrx200-firmware-xdsl-b-patch
-endef
-
-$(eval $(call Profile,TDW8980))
-
-define Profile/VR200v
-  NAME:=TP-LINK Archer VR200v
-  PACKAGES:=kmod-usb-dwc2 kmod-ledtrig-usbdev dsl-vrx200-firmware-xdsl-a dsl-vrx200-firmware-xdsl-b-patch
-endef
-
-$(eval $(call Profile,VR200v))
diff --git a/target/linux/lantiq/xrx200/target.mk b/target/linux/lantiq/xrx200/target.mk
index 50abb24cb9..e112ea0996 100644
--- a/target/linux/lantiq/xrx200/target.mk
+++ b/target/linux/lantiq/xrx200/target.mk
@@ -13,6 +13,8 @@ DEFAULT_PACKAGES+=kmod-leds-gpio \
 	kmod-ltq-ptm-vr9 \
 	kmod-ltq-deu-vr9 \
 	ltq-vdsl-app \
+	dsl-vrx200-firmware-xdsl-a \
+	dsl-vrx200-firmware-xdsl-b-patch \
 	ppp-mod-pppoa \
 	swconfig
 
diff --git a/target/linux/lantiq/xway/profiles/00-default.mk b/target/linux/lantiq/xway/profiles/00-default.mk
new file mode 100644
index 0000000000..26bc8b502b
--- /dev/null
+++ b/target/linux/lantiq/xway/profiles/00-default.mk
@@ -0,0 +1,9 @@
+define Profile/Default
+	NAME:=Default Profile
+	PRIORITY:=1
+endef
+
+define Profile/Default/Description
+	Default package set compatible with most boards.
+endef
+$(eval $(call Profile,Default))
diff --git a/target/linux/lantiq/xway/profiles/arv.mk b/target/linux/lantiq/xway/profiles/arv.mk
deleted file mode 100644
index 976cd194d0..0000000000
--- a/target/linux/lantiq/xway/profiles/arv.mk
+++ /dev/null
@@ -1,167 +0,0 @@
-define Profile/ARV4525PW
-  NAME:=Speedport W502V Typ A - ARV4525PW
-  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
-endef
-
-$(eval $(call Profile,ARV4525PW))
-
-define Profile/ARV8539PW22
-  NAME:=Speedport W504V Typ A - ARV8539PW22
-  PACKAGES:=kmod-ltq-hcd-danube \
-        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 wpad-mini \
-        swconfig
-endef
-
-$(eval $(call Profile,ARV8539PW22))
-
-define Profile/ARV7525PW
-  NAME:=Speedport W303V Typ A - ARV7525PW
-  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
-endef
-
-$(eval $(call Profile,ARV7525PW))
-
-define Profile/ARV4518PWR01
-  NAME:=ARV4518PWR01
-  PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-	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 \
-	swconfig
-endef
-
-$(eval $(call Profile,ARV4518PWR01))
-
-define Profile/ARV4518PWR01A
-  NAME:=ARV4518PWR01A
-  PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-        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 \
-        swconfig
-endef
-
-$(eval $(call Profile,ARV4518PWR01A))
-
-define Profile/ARV4510PW
-  NAME:=Wippies, Elisa - ARV4510PW
-  PACKAGES:=kmod-ledtrig-usbdev 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 \
-	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ltq-tapi kmod-ltq-vmmc \
-	kmod-rt2800-pci kmod-ath5k wpad-mini \
-	swconfig
-endef
-
-$(eval $(call Profile,ARV4510PW))
-
-define Profile/ARV4519PW
-  NAME:=Vodafone, Pirelli - ARV4519PW
-  PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-	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 \
-	swconfig
-endef
-
-$(eval $(call Profile,ARV4519PW))
-
-define Profile/ARV7510PW22
-  NAME:=Astoria - ARV7510PW22
-  PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-	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-ltq-tapi kmod-ltq-vmmc \
-	kmod-rt2800-pci wpad-mini \
-	kmod-usb-uhci kmod-usb2 kmod-usb2-pci \
-	swconfig
-endef
-
-$(eval $(call Profile,ARV7510PW22))
-
-define Profile/ARV7518PW
-  NAME:=Astoria - ARV7518PW
-  PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-	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 wpad-mini \
-	swconfig
-endef
-
-$(eval $(call Profile,ARV7518PW))
-
-define Profile/ARV7519PW
-  NAME:=Astoria - ARV7519PW
-  PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-	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 \
-	swconfig
-endef
-
-$(eval $(call Profile,ARV7519PW))
-
-define Profile/ARV4520PW
-  NAME:=Easybox 800, WAV-281 - ARV4520PW
-  PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-	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 \
-	swconfig
-endef
-
-$(eval $(call Profile,ARV4520PW))
-
-define Profile/ARV452CQW
-  NAME:=Easybox 801 - ARV452CQW
-  PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-  	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
-endef
-
-$(eval $(call Profile,ARV452CQW))
-
-define Profile/ARV752DPW
-  NAME:=Easybox 802 - ARV752DPW
-  PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-	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-ltq-tapi kmod-ltq-vmmc \
-	kmod-rt2800-pci wpad-mini \
-	swconfig
-endef
-
-$(eval $(call Profile,ARV752DPW))
-
-define Profile/ARV752DPW22
-  NAME:=Easybox 803 - ARV752DPW22
-  PACKAGES:=kmod-usb2-pci kmod-usb-uhci kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-	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-ltq-tapi kmod-ltq-vmmc \
-	kmod-rt2800-pci wpad-mini \
-	swconfig
-endef
-
-$(eval $(call Profile,ARV752DPW22))
diff --git a/target/linux/lantiq/xway/profiles/audiocodes.mk b/target/linux/lantiq/xway/profiles/audiocodes.mk
deleted file mode 100644
index 006cc50c13..0000000000
--- a/target/linux/lantiq/xway/profiles/audiocodes.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-define Profile/ACMP252
-  NAME:=AudioCodes MediaPack MP-252
-  PACKAGES:=kmod-rt2x00-pci wpad-mini \
-	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
-	kmod-ltq-adsl-danube-fw-a kmod-ltq-ptm-danube \
-	ltq-adsl-app
-endef
-
-$(eval $(call Profile,ACMP252))
diff --git a/target/linux/lantiq/xway/profiles/aztech.mk b/target/linux/lantiq/xway/profiles/aztech.mk
deleted file mode 100644
index 8f4887720e..0000000000
--- a/target/linux/lantiq/xway/profiles/aztech.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-define Profile/GR7000
-  NAME:=Aztech GR7000
-  PACKAGES:= \
-	kmod-ltq-deu-ar9 kmod-usb-dwc2 \
-	swconfig
-endef
-$(eval $(call Profile,GR7000))
diff --git a/target/linux/lantiq/xway/profiles/buffalo.mk b/target/linux/lantiq/xway/profiles/buffalo.mk
deleted file mode 100644
index 687975011a..0000000000
--- a/target/linux/lantiq/xway/profiles/buffalo.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-define Profile/WBMRA
-  NAME:=Buffalo WBMR-HP-G300H (A) - WBMR
-  PACKAGES:=kmod-usb-dwc2 kmod-ledtrig-usbdev \
-	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
-	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
-	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k wpad hostapd-utils \
-	swconfig
-endef
-
-$(eval $(call Profile,WBMRA))
-
-define Profile/WBMRB
-  NAME:=Buffalo WBMR-HP-G300H (B) - WBMR
-  PACKAGES:=kmod-usb-dwc2 kmod-ledtrig-usbdev \
-	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
-	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
-	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k wpad hostapd-utils \
-	swconfig
-endef
-
-$(eval $(call Profile,WBMRB))
diff --git a/target/linux/lantiq/xway/profiles/gigaset.mk b/target/linux/lantiq/xway/profiles/gigaset.mk
deleted file mode 100644
index c6259af972..0000000000
--- a/target/linux/lantiq/xway/profiles/gigaset.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-define Profile/GIGASX76X
-  NAME:=Gigaset sx76x
-  PACKAGES:= kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
-        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 \
-        swconfig
-endef
-
-$(eval $(call Profile,GIGASX76X))
diff --git a/target/linux/lantiq/xway/profiles/lantiq.mk b/target/linux/lantiq/xway/profiles/lantiq.mk
deleted file mode 100644
index 800a9f6768..0000000000
--- a/target/linux/lantiq/xway/profiles/lantiq.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-define Profile/EASY50712
-  NAME:=Lantiq Danube - EASY50712
-endef
-
-$(eval $(call Profile,EASY50712))
diff --git a/target/linux/lantiq/xway/profiles/zte.mk b/target/linux/lantiq/xway/profiles/zte.mk
deleted file mode 100644
index 7de0b26be1..0000000000
--- a/target/linux/lantiq/xway/profiles/zte.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-define Profile/H201L
-  NAME:=ZTE H201L - H201L
-  PACKAGES:=kmod-ath9k-htc 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 \
-	kmod-ltq-tapi kmod-ltq-vmmc \
-	swconfig
-endef
-
-$(eval $(call Profile,H201L))
diff --git a/target/linux/lantiq/xway/profiles/zyxel.mk b/target/linux/lantiq/xway/profiles/zyxel.mk
deleted file mode 100644
index a1177fbf1f..0000000000
--- a/target/linux/lantiq/xway/profiles/zyxel.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-define Profile/P2601HNFX
-  NAME:=ZyXEL P-2601HN-Fx
-  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 \
-	swconfig
-endef
-$(eval $(call Profile,P2601HNFX))