X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fimage%2FMakefile;h=3c3318d520017488ec8ab44ef8d17ce799e36098;hp=a601d38c11861f8cc9588d50f514cc9813c31235;hb=9f5ee6f6c03887d34f56d54daa77866e34b8833e;hpb=ba42c1db418e37a8061c22556b89522e02533b5c

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index a601d38c11..3c3318d520 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -16,6 +16,12 @@ KERNEL_ENTRY = 0x80002000
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+ifeq ($(SUBTARGET),xway)
+  UBIFS_OPTS := -m 512 -e 15872 -c 1959
+else
+  UBIFS_OPTS := -m 2048 -e 126KiB -c 4096
+endif
+
 LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
 
 define Image/BuildLoader/Template
@@ -27,6 +33,11 @@ define Image/BuildLoader/Template
 		compile loader.bin
 endef
 
+define Build/eva-image
+	lzma2eva $(KERNEL_LOADADDR) $(KERNEL_LOADADDR) $@ $@.new
+	( dd if=$@.new bs=64k conv=sync; cat ./eva.dummy.squashfs; ) > $@
+endef
+
 
 define CompressLzma
 	$(STAGING_DIR_HOST)/bin/lzma e $(1) $(2)
@@ -45,27 +56,11 @@ define MkImageLzma
 		-d $(KDIR)/vmlinux$(2)-$(1).lzma $(KDIR)/uImage-$(1)$(2)
 endef
 
-define MkImageEVA
-	lzma2eva 0x80002000 0x80002000 $(KDIR)/vmlinux$(2)-$(1).lzma $(KDIR)/$(1)$(2).eva.prealign
-	dd if=$(KDIR)/$(1)$(2).eva.prealign of=$(KDIR)/$(1)$(2).eva.align.64k bs=64k conv=sync
-	dd if=$(KDIR)/$(1)$(2).eva.prealign of=$(KDIR)/$(1)$(2).eva.align.128k bs=128k conv=sync
-	cat ./eva.dummy.squashfs >> $(KDIR)/$(1)$(2).eva.align.64k
-endef
-
 define Image/Build/squashfs
 	cat $(KDIR)/uImage-$(2) $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image
 	$(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image)
 endef
 
-define Image/BuildNAND/squashfs
-
-ifneq ($($(PROFILE)_UBI_OPTS),)
-	$(call prepare_generic_squashfs,$(KDIR)/root.$(1))
-	$(call Image/Build/UbinizeImage,$(PROFILE),,squashfs,$($(PROFILE)_UBI_OPTS))
-	$(call Image/Build/SysupgradeNAND,$(PROFILE),$(1),$(KDIR)/uImage-$(PROFILE))
-endif
-endef
-
 DGN3500_SKERNEL=0x50000
 DGN3500_SKERNEL_DECIMAL=327680
 define Image/BuildDGN3500/squashfs
@@ -103,176 +98,112 @@ define Image/BuildDGN3500B/squashfs
 endef
 
 
-define Image/BuildEVA/squashfs
-	cat $(KDIR)/$(2).eva.align.64k $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image.eva
-	$(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image.eva)
-endef
-
-define Image/BuildEVA/ubifs
-
-ifneq ($($(PROFILE)_UBIFS_OPTS),)
-	$(CP) $(KDIR)/root.ubifs $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-rootfs.ubifs
-endif
-endef
-
-define Image/BuildEVA/ubi
-
-ifneq ($($(PROFILE)_UBI_OPTS),)
-	$(CP) $(KDIR)/root.ubi $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-rootfs.ubi
-	$(CP) $(KDIR)/root-overlay.ubi $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-rootfs-overlay.ubi
-endif
-endef
-
 define Image/BuildLoader/squashfs
 	dd if=$(KDIR)/loader-$(2).bin of=$(KDIR)/loader-$(2).bin.padded bs=3072k conv=sync
 	cat $(KDIR)/loader-$(2).bin.padded $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image
 	$(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image)
 endef
 
-define Image/BuildEVA/jffs2-128k
-	cat $(KDIR)/$(2).eva.align.128k $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image.eva
-endef
-
-define Image/Build/jffs2-64k
-	dd if=$(KDIR)/uImage-$(2) of=$(KDIR)/uImage-$(2)-$(1) bs=64k conv=sync
-	cat $(KDIR)/uImage-$(2)-$(1) $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image
-endef
-
-define Image/Build/jffs2-128k
-	dd if=$(KDIR)/uImage-$(2) of=$(KDIR)/uImage-$(2)-$(1) bs=128k conv=sync
-	cat $(KDIR)/uImage-$(2)-$(1) $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image
-endef
-
-define Image/Build/jffs2-256k
-	dd if=$(KDIR)/uImage-$(2) of=$(KDIR)/uImage-$(2)-$(1) bs=256k conv=sync
-	cat $(KDIR)/uImage-$(2)-$(1) $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image
-endef
-
-define Image/Build/ubifs
-
-ifneq ($($(PROFILE)_UBIFS_OPTS),)
-	$(CP) $(KDIR)/root.ubifs $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-rootfs.ubifs
-endif
-endef
-
-define Image/Build/ubi
-
-ifneq ($($(PROFILE)_UBI_OPTS),)
-	$(CP) $(KDIR)/root.ubi $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-rootfs.ubi
-	$(CP) $(KDIR)/root-overlay.ubi $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-rootfs-overlay.ubi
-endif
-endef
-
-
-define Image/BuildNAND/ubifs
-
-ifneq ($($(PROFILE)_UBIFS_OPTS),)
-ifneq ($($(PROFILE)_UBI_OPTS),)
-	$(call Image/Build/UbinizeImage,$(PROFILE),,ubifs,$($(PROFILE)_UBI_OPTS))
-	$(call Image/Build/SysupgradeNAND,$(PROFILE),$(1),$(KDIR)/uImage-$(PROFILE))
-endif
-endif
-endef
-
-
-define Image/InstallKernel/Template
-
-ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),)
-	$(INSTALL_DIR) $(TARGET_DIR)/boot
-
-ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE),)
-	$(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-uImage $(TARGET_DIR)/boot/
-	ln -sf $(IMG_PREFIX)-$(1)-uImage $(TARGET_DIR)/boot/uImage
-endif
-
-ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE),)
-	$(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-zImage $(TARGET_DIR)/boot/
-	ln -sf $(IMG_PREFIX)-$(1)-zImage $(TARGET_DIR)/boot/zImage
-endif
-endif
-
-ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
-	$(INSTALL_DIR) $(TARGET_DIR)/boot
-
-ifneq ($(1),)
-	$(CP) $(KDIR)/$(1).dtb $(TARGET_DIR)/boot/
-endif
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+  define Image/BuildKernel/InitramfsTemplate
+	$(call PatchKernelLzma,$(1),-initramfs)
+	$(call MkImageLzma,$(1),-initramfs)
+	$(CP) $(KDIR)/uImage-$(1)-initramfs $(BIN_DIR)/$(IMG_PREFIX)-$(1)-uImage-initramfs
+  endef
 endif
-endef
 
 define Image/BuildKernel/Template
 	$(call PatchKernelLzma,$(1))
 	$(call MkImageLzma,$(1))
 	$(CP) $(KDIR)/uImage-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-uImage
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-	$(call PatchKernelLzma,$(1),-initramfs)
-	$(call MkImageLzma,$(1),-initramfs)
-	$(CP) $(KDIR)/uImage-$(1)-initramfs $(BIN_DIR)/$(IMG_PREFIX)-$(1)-uImage-initramfs
-endif
+	$(Image/BuildKernel/InitramfsTemplate)
 endef
 
-define Image/BuildKernelLoader/Template
-	$(CP) $(KDIR)/loader-$(1).bin $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux-loader
-	$(CP) $(KDIR)/vmlinux-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+  define Image/BuildKernelLoader/InitramfsTemplate
 	$(CP) $(KDIR)/loader-initramfs-$(1).bin $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux-initramfs-loader
 	$(CP) $(KDIR)/vmlinux-initramfs-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux-initramfs
+  endef
 endif
+
+define Image/BuildKernelLoader/Template
+	$(CP) $(KDIR)/loader-$(1).bin $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux-loader
+	$(CP) $(KDIR)/vmlinux-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux
+	$(Image/BuildKernelLoader/InitramfsTemplate)
 endef
 
-define Image/Prepare/Profile
-	$(call PatchKernelLzma,$(1))
-	$(call Image/BuildLoader/Template,$(1))
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+  define Image/Prepare/InitramfsTemplate
 	$(call PatchKernelLzma,$(1),-initramfs)
 	$(call Image/BuildLoader/Template,$(1),-initramfs)
+  endef
 endif
-endef
 
-define Image/BuildKernelEVA/Template
+define Image/Prepare/Template
 	$(call PatchKernelLzma,$(1))
-	$(call MkImageEVA,$(1))
-	$(CP) $(KDIR)/$(1).eva.align.64k $(BIN_DIR)/$(IMG_PREFIX)-$(1).eva.align.64k
-	$(CP) $(KDIR)/$(1).eva.align.128k $(BIN_DIR)/$(IMG_PREFIX)-$(1).eva.align.128k
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-	$(call PatchKernelLzma,$(1),-initramfs)
-	$(call MkImageEVA,$(1),-initramfs)
-	$(CP) $(KDIR)/$(1)-initramfs.eva.align.64k $(BIN_DIR)/$(IMG_PREFIX)-$(1)-initramfs.eva.align.64k
-	$(CP) $(KDIR)/$(1)-initramfs.eva.align.128k $(BIN_DIR)/$(IMG_PREFIX)-$(1)-initramfs.eva.align.128k
-endif
+	$(call Image/BuildLoader/Template,$(1))
+	$(Image/Prepare/InitramfsTemplate)
 endef
 
-
 ### Kernel scripts ###
-define Build/append-dtb
-	$(call Image/BuildDTB,../dts/$(DEVICE_DTS).dts,$@.dtb)
-	cat $@.dtb >> $@
-endef
-
 define Build/mkbrncmdline
    mkbrncmdline -i $@ -o $@.new BRN-BOOT
    mv $@.new $@
 endef
 
 define Build/mkbrnimg
-   mkbrnimg -s $(SIGNATURE) -m $(MAGIC) -p $(CRC32_POLY) -o $@ $(word 1,$^) $(word 2,$^)
+   mkbrnimg -s $(SIGNATURE) -m $(MAGIC) -p $(CRC32_POLY) -o $@ $(IMAGE_KERNEL) $(IMAGE_ROOTFS)
+endef
+
+define Build/fullimage
+	mkimage -A mips -O linux -C lzma -T filesystem -a 0x00  \
+		-e 0x00 -n 'LEDE RootFS' \
+		-d $(IMAGE_ROOTFS) $(IMAGE_ROOTFS).new
+
+	cat $(IMAGE_KERNEL) $(IMAGE_ROOTFS).new > $@.tmp
+
+	mkimage -A mips -O linux -T multi -a 0x00 -C none \
+		-e 0x00 -n 'OpenWrt fullimage' \
+		-d $@.tmp $@
+
+	rm $(IMAGE_ROOTFS).new
+	rm $@.tmp
 endef
 
 # Shared device definition: applies to every defined device
 define Device/Default
-  PROFILES = Default $$(DEVICE_PROFILE)
+  PROFILES = Default
   KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
   KERNEL_INITRAMFS_NAME = $$(KERNEL_NAME)-initramfs
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
   FILESYSTEMS := squashfs
-  DEVICE_PROFILE :=
-  DEVICE_DTS :=
+  DEVICE_DTS := $(1)
+  DEVICE_DTS_DIR := ../dts
   IMAGE_SIZE :=
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
 endef
-DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS IMAGE_SIZE
+DEVICE_VARS += IMAGE_SIZE
+
+define Device/NAND/xway
+  BLOCKSIZE := 16KiB
+  PAGESIZE := 512
+  SUBPAGESIZE := 256
+  FILESYSTEMS += ubifs
+endef
+
+define Device/NAND/xrx200
+  BLOCKSIZE := 128KiB
+  PAGESIZE := 2048
+  SUBPAGESIZE := 512
+  FILESYSTEMS += ubifs
+endef
+
+define Device/NAND
+  $(Device/NAND/$(SUBTARGET))
+  IMAGE/sysupgrade.bin := sysupgrade-tar
+endef
 
 define Device/lantiqBrnImage
   KERNEL := kernel-bin | append-dtb | mkbrncmdline | lzma-no-dict
@@ -281,54 +212,33 @@ define Device/lantiqBrnImage
 endef
 DEVICE_VARS += SIGNATURE MAGIC CRC32_POLY
 
-ifeq ($(SUBTARGET),xway)
-
-# Danube
-BTHOMEHUBV2B_UBIFS_OPTS:="-m 512 -e 15872 -c 1959"
-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)
-
-define Device/EASY50712
-  DEVICE_PROFILE := EASY50712
-  IMAGE_SIZE := 3776k
-  DEVICE_DTS := EASY50712
-  DEVICE_TITLE := Lantiq Danube - EASY50712
+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)
 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
+define Device/AVM
+  $(Device/NAND)
+  KERNEL := kernel-bin | append-dtb | lzma | eva-image
 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 \
+ifeq ($(SUBTARGET),xway_legacy)
+
+define Device/ARV4520PW
+  IMAGE_SIZE := 3648k
+  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-a kmod-ltq-atm-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 kmod-ath5k wpad-mini \
+	kmod-rt61-pci wpad-mini \
 	swconfig
 endef
-TARGET_DEVICES += ARV4510PW
+TARGET_DEVICES += ARV4520PW
 
 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 \
@@ -337,22 +247,20 @@ define Device/ARV4525PW
 endef
 TARGET_DEVICES += ARV4525PW
 
-define Device/ARV7525PW
-  DEVICE_PROFILE := ARV7525PW
+define Device/ARV452CQW
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV7525PW
-  DEVICE_TITLE := Speedport W303V Typ A - ARV7525PW
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini \
+  DEVICE_TITLE := Easybox 801 - ARV452CQW
+  DEVICE_PACKAGES := kmod-ltq-hcd-danube \
+	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
+	ltq-adsl-app ppp-mod-pppoa \
+	swconfig
 endef
-TARGET_DEVICES += ARV7525PW
+TARGET_DEVICES += ARV452CQW
 
 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 \
@@ -364,9 +272,7 @@ 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 \
@@ -377,51 +283,88 @@ define Device/ARV4518PWR01A
 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 \
+endif
+
+ifeq ($(SUBTARGET),xway)
+
+# Danube
+
+define Device/BTHOMEHUBV2B
+  $(Device/NAND)
+  DEVICE_TITLE := BT Home Hub 2B
+  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 \
+	kmod-ltq-deu-danube \
 	ltq-adsl-app ppp-mod-pppoa \
+	kmod-ath9k wpad-mini \
 	swconfig
 endef
-TARGET_DEVICES += ARV4519PW
+TARGET_DEVICES += BTHOMEHUBV2B
 
-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 \
+define Device/EASY50712
+  IMAGE_SIZE := 3776k
+  DEVICE_TITLE := Lantiq Danube - EASY50712
+endef
+TARGET_DEVICES += EASY50712
+
+define Device/ACMP252
+  IMAGE_SIZE := 14848k
+  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-b kmod-ltq-atm-danube \
+	kmod-ltq-adsl-danube-fw-a kmod-ltq-ptm-danube \
+	ltq-adsl-app
+endef
+TARGET_DEVICES += ACMP252
+
+define Device/ARV4510PW
+  IMAGE_SIZE := 15616k
+  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-rt61-pci wpad-mini \
+	kmod-ltq-tapi kmod-ltq-vmmc \
+	kmod-rt2800-pci kmod-ath5k wpad-mini \
 	swconfig
 endef
-TARGET_DEVICES += ARV4520PW
+TARGET_DEVICES += ARV4510PW
 
-define Device/ARV452CQW
-  DEVICE_PROFILE := ARV452CQW
+define Device/ARV7525PW
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV452CQW
-  DEVICE_TITLE := Easybox 801 - ARV452CQW
+  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/ARV4519PW
+  IMAGE_SIZE := 3776k
+  DEVICE_TITLE := Vodafone, Pirelli - ARV4519PW
   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-a kmod-ltq-atm-danube \
+	ltq-adsl-app ppp-mod-pppoa \
+	swconfig
+endef
+TARGET_DEVICES += ARV4519PW
+
+define Device/ARV7506PW11
+  IMAGE_SIZE := 7808k
+  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 \
 	swconfig
 endef
-TARGET_DEVICES += ARV452CQW
+TARGET_DEVICES += ARV7506PW11
 
 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 \
@@ -435,9 +378,7 @@ 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 \
@@ -449,9 +390,7 @@ 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 \
@@ -463,9 +402,7 @@ 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 \
@@ -478,9 +415,7 @@ 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 \
@@ -493,9 +428,7 @@ 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 \
@@ -507,9 +440,7 @@ 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 \
@@ -521,22 +452,50 @@ endef
 TARGET_DEVICES += GIGASX76X
 
 
-
 # AR9
-BTHOMEHUBV3A_UBIFS_OPTS:="-m 512 -e 15872 -c 1959"
-BTHOMEHUBV3A_UBI_OPTS:="-m 512 -p 16KiB -s 256"
 
-Image/BuildKernel/Profile/BTHOMEHUBV3A=$(call Image/BuildKernel/Template,BTHOMEHUBV3A)
-Image/Build/Profile/BTHOMEHUBV3A=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV3A)
+define Device/BTHOMEHUBV3A
+  $(Device/NAND)
+  DEVICE_TITLE := BT Home Hub 3A
+  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 \
+	kmod-ltq-deu-ar9 \
+	ltq-adsl-app ppp-mod-pppoa \
+	kmod-ath9k wpad-mini \
+	swconfig uboot-envtools
+endef
+TARGET_DEVICES += BTHOMEHUBV3A
 
 Image/BuildKernel/Profile/DGN3500=$(call Image/BuildKernel/Template,DGN3500)
 Image/Build/Profile/DGN3500=$(call Image/BuildDGN3500/$(1),$(1),DGN3500)
 
+define LegacyDevice/DGN3500
+  DEVICE_TITLE := Netgear DGN3500
+  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ledtrig-usbdev \
+	kmod-ath9k wpad-mini \
+	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-ltq-deu-ar9 swconfig
+endef
+LEGACY_DEVICES += DGN3500
+
 Image/BuildKernel/Profile/DGN3500B=$(call Image/BuildKernel/Template,DGN3500B)
 Image/Build/Profile/DGN3500B=$(call Image/BuildDGN3500B/$(1),$(1),DGN3500B)
 
+define LegacyDevice/DGN3500B
+  DEVICE_TITLE := Netgear DGN3500B
+  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ledtrig-usbdev \
+	kmod-ath9k 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-pppoa \
+	kmod-ltq-deu-ar9 swconfig
+endef
+LEGACY_DEVICES += DGN3500B
+
 define Device/WBMRA
-  DEVICE_PROFILE := WBMRA
   IMAGE_SIZE := 31488k
   DEVICE_DTS := WBMR
   DEVICE_TITLE := Buffalo WBMR-HP-G300H (A) - WBMR
@@ -550,7 +509,6 @@ endef
 TARGET_DEVICES += WBMRA
 
 define Device/WBMRB
-  DEVICE_PROFILE := WBMRB
   IMAGE_SIZE := 31488k
   DEVICE_DTS := WBMR
   DEVICE_TITLE := Buffalo WBMR-HP-G300H (B) - WBMR
@@ -563,38 +521,33 @@ define Device/WBMRB
 endef
 TARGET_DEVICES += WBMRB
 
-
-Image/BuildKernel/Profile/FRITZ7320=$(call Image/BuildKernelEVA/Template,FRITZ7320)
-Image/Build/Profile/FRITZ7320=$(call Image/BuildEVA/$(1),$(1),FRITZ7320)
-
-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
+define Device/FRITZ7320
+  $(Device/AVM)
+  DEVICE_TITLE := 1&1 HomeServer - FRITZ7320
+  DEVICE_PACKAGES := kmod-ath9k 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-pppoa \
+	kmod-ltq-deu-ar9 kmod-usb-dwc2 \
+	kmod-ath9k wpad-mini
 endef
-TARGET_DEVICES += GR7000
+TARGET_DEVICES += FRITZ7320
 
 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-deu-ar9 kmod-usb-dwc2 kmod-ledtrig-usbdev \
 	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 \
@@ -612,68 +565,84 @@ endif
 ifeq ($(SUBTARGET),xrx200)
 
 # VR9
-P2812HNUF1_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-P2812HNUF1_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
-Image/BuildKernel/Profile/P2812HNUF1=$(call Image/BuildKernel/Template,P2812HNUF1)
-Image/Build/Profile/P2812HNUF1=$(call Image/BuildNAND/$(1),$(1),P2812HNUF1)
 
-P2812HNUF3_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-P2812HNUF3_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+define Device/P2812HNUF1
+  $(Device/NAND)
+  DEVICE_TITLE := ZyXEL P-2812HNU-F1
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 kmod-ledtrig-usbdev
+endef
+TARGET_DEVICES += P2812HNUF1
 
-Image/BuildKernel/Profile/P2812HNUF3=$(call Image/BuildKernel/Template,P2812HNUF3)
-Image/Build/Profile/P2812HNUF3=$(call Image/BuildNAND/$(1),$(1),P2812HNUF3)
+define Device/P2812HNUF3
+  $(Device/NAND)
+  DEVICE_TITLE := ZyXEL P-2812HNU-F3
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += P2812HNUF3
 
 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"
-
-Image/BuildKernel/Profile/BTHOMEHUBV5A=$(call Image/BuildKernel/Template,BTHOMEHUBV5A)
-Image/Build/Profile/BTHOMEHUBV5A=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV5A)
+define Device/BTHOMEHUBV5A
+  $(Device/NAND)
+  DEVICE_TITLE := BT Home Hub 5A
+  DEVICE_PACKAGES := kmod-ath9k kmod-ath10k ath10k-firmware-qca988x wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += BTHOMEHUBV5A
 
 define Device/EASY80920NAND
-  DEVICE_PROFILE := EASY80920NAND
+  $(Device/lantiqFullImage)
   IMAGE_SIZE := 64512k
-  DEVICE_DTS := EASY80920NAND
   DEVICE_TITLE := Lantiq VR9 - EASY80920NAND
-  DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
+  DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2 kmod-ledtrig-usbdev
 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
+  DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2 kmod-ledtrig-usbdev
 endef
 TARGET_DEVICES += EASY80920NOR
 
+define Device/FRITZ3370
+  $(Device/AVM)
+  DEVICE_TITLE := Fritz!Box WLan - FRITZ3370
+  DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += FRITZ3370
 
-FRITZ3370_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-FRITZ3370_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
-Image/BuildKernel/Profile/FRITZ3370=$(call Image/BuildKernelEVA/Template,FRITZ3370)
-Image/Build/Profile/FRITZ3370=$(call Image/BuildEVA/$(1),$(1),FRITZ3370)
+define Device/FRITZ7360SL
+  $(Device/AVM)
+  DEVICE_TITLE := 1&1 HomeServer - FRITZ7360SL
+  DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += FRITZ7360SL
 
+Image/Prepare/Profile/VG3503J=$(call Image/Prepare/Template,VG3503J)
 Image/BuildKernel/Profile/VG3503J=$(call Image/BuildKernelLoader/Template,VG3503J)
 Image/Build/Profile/VG3503J=$(call Image/BuildLoader/$(1),$(1),VG3503J)
 
+define LegacyDevice/VG3503J
+  DEVICE_TITLE := BT Openreak - ECI VDSL Modem
+endef
+LEGACY_DEVICES += VG3503J
+
 include tp-link.mk
 
+define Device/WBMR300
+  IMAGE_SIZE := 15616k
+  DEVICE_TITLE := Buffalo WBMR-300HPD
+  DEVICE_PACKAGES := kmod-mt76 wpad-mini kmod-usb-dwc2
+endef
+TARGET_DEVICES += WBMR300
+
 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
@@ -681,8 +650,6 @@ TARGET_DEVICES += VGV7510KW22NOR
 
 define Device/VGV7510KW22BRN
   $(Device/lantiqBrnImage)
-  DEVICE_PROFILE := VGV7510KW22BRN
-  DEVICE_DTS := VGV7510KW22BRN
   IMAGE_SIZE := 7168k
   SIGNATURE := 5D00008000
   MAGIC := 0x12345678
@@ -693,9 +660,7 @@ 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
@@ -703,8 +668,6 @@ TARGET_DEVICES += VGV7519NOR
 
 define Device/VGV7519BRN
   $(Device/lantiqBrnImage)
-  DEVICE_PROFILE := VGV7519BRN
-  DEVICE_DTS := VGV7519BRN
   IMAGE_SIZE := 7168k
   SIGNATURE := 5D00008000
   MAGIC := 0x12345678
@@ -714,22 +677,18 @@ define Device/VGV7519BRN
 endef
 TARGET_DEVICES += VGV7519BRN
 
-define Image/Prepare
-	$(call Image/Prepare/Profile,$(PROFILE))
-endef
-
 endif
 
-define Image/BuildKernel
-	$(call Image/BuildKernel/Profile/$(PROFILE))
+define Image/Prepare/Profile
+	$(call Image/Prepare/Profile/$(1))
 endef
 
-define Image/InstallKernel
-	$(call Image/InstallKernel/Template/$(PROFILE))
+define Image/BuildKernel/Profile
+	$(call Image/BuildKernel/Profile/$(1))
 endef
 
-define Image/Build
-	$(call Image/Build/Profile/$(PROFILE),$(1))
+define Image/Build/Profile
+	$(call Image/Build/Profile/$(1),$(2))
 endef
 
 $(eval $(call BuildImage))