diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index 73b6ca8c3..82c79c852 100644
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -3,15 +3,34 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+UBIFS_OPTS = -m 2048 -e 124KiB -c 4096 -U -F
+
+define Image/Prepare
+	$(CP) $(LINUX_DIR)/vmlinux $(KDIR)/vmlinux-unstripped.elf
+endef
+
+define Image/BuildKernel
+	$(CP) $(KDIR)/vmlinux-unstripped.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
+endef
+
+define Image/Build/squashfs
+	cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-raw
+	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+endef
+
+define Image/Build
+	$(call Image/Build/$(1),$(1))
+	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1)-root.img bs=2k conv=sync
+endef
+
 define Device/Default
 	PROFILES := Default
 	KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
 	KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
 	KERNEL_PREFIX := $$(IMAGE_PREFIX)
 	KERNEL_LOADADDR = 0x42208000
-	SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
-	IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
-	IMAGE/sysupgrade.bin/squashfs :=
+	SUPPORTED_DEVICES = $$(BOARD_NAME)
+	IMAGE/sysupgrade.tar = sysupgrade-tar | append-metadata
 endef
 
 define Device/LegacyImage
@@ -34,25 +53,29 @@ endef
 
 define Device/UbiFit
 	KERNEL_IN_UBI := 1
-	IMAGES := nand-factory.bin nand-sysupgrade.bin
-	IMAGE/nand-factory.bin := append-ubi
-	IMAGE/nand-sysupgrade.bin := sysupgrade-tar | append-metadata
+	IMAGES := nand-factory.ubi nand-sysupgrade.tar
+	IMAGE/nand-factory.ubi := append-ubi
+	IMAGE/nand-sysupgrade.tar := sysupgrade-tar | append-metadata
 endef
 
 define Device/DniImage
+	PROFILES += $$(DEVICE_NAME)
+	FILESYSTEMS := squashfs
 	KERNEL_SUFFIX := -uImage
 	KERNEL = kernel-bin | append-dtb | uImage none
 	KERNEL_NAME := zImage
 	NETGEAR_BOARD_ID :=
 	NETGEAR_HW_ID :=
 	UBINIZE_OPTS := -E 5
-	IMAGES := factory.img sysupgrade.bin
+	IMAGES := factory.img sysupgrade.tar
 	IMAGE/factory.img := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakeroot-hdr | pad-to $$$$(KERNEL_SIZE) | append-ubi | netgear-dni
-	IMAGE/sysupgrade.bin := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakeroot-hdr | sysupgrade-tar kernel=$$$$@ | append-metadata
+	IMAGE/sysupgrade.tar := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakeroot-hdr | sysupgrade-tar kernel=$$$$@ | append-metadata
 endef
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 
 define Device/TpSafeImage
+	PROFILES += $$(DEVICE_NAME)
+	FILESYSTEMS := squashfs
 	KERNEL_SUFFIX := -uImage
 	KERNEL = kernel-bin | append-dtb | uImage none
 	KERNEL_NAME := zImage
@@ -64,44 +87,55 @@ endef
 DEVICE_VARS += TPLINK_BOARD_ID
 
 define Device/ZyXELImage
+	PROFILES += $$(DEVICE_NAME)
+	FILESYSTEMS := squashfs
 	KERNEL_SUFFIX := -uImage
 	KERNEL = kernel-bin | append-dtb | uImage none | pad-to $${KERNEL_SIZE}
 	KERNEL_NAME := zImage
-	IMAGES := sysupgrade.bin mmcblk0p5-rootfs.bin mmcblk0p4-kernel.bin
-	IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to $$$${BLOCKSIZE} | sysupgrade-tar rootfs=$$$$@ | append-metadata
+	IMAGES := sysupgrade.tar mmcblk0p5-rootfs.bin mmcblk0p4-kernel.bin
+	IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$${BLOCKSIZE} | sysupgrade-tar rootfs=$$$$@ | append-metadata
 	IMAGE/mmcblk0p5-rootfs.bin := append-rootfs | pad-rootfs | pad-to $$$${BLOCKSIZE}
 	IMAGE/mmcblk0p4-kernel.bin := append-kernel
 endef
 
-define Device/compex_wpq864
+define Device/AP148
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
+	DEVICE_DTS := qcom-ipq8064-ap148
+	KERNEL_INSTALL := 1
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
-	DEVICE_DTS := qcom-ipq8064-wpq864
-	DEVICE_TITLE := Compex WPQ864
-	DEVICE_PACKAGES := kmod-gpio-beeper
-endef
-TARGET_DEVICES += compex_wpq864
-
-define Device/linksys_ea8500
-	$(call Device/LegacyImage)
-	DEVICE_DTS := qcom-ipq8064-ea8500
-	PAGESIZE := 2048
-	BLOCKSIZE := 128k
-	KERNEL_SIZE := 3072k
-	KERNEL = kernel-bin | append-dtb | uImage none | append-uImage-fakeroot-hdr
-	BOARD_NAME := ea8500
-	SUPPORTED_DEVICES += ea8500
-	UBINIZE_OPTS := -E 5
-	IMAGES := factory.bin sysupgrade.bin
-	IMAGE/factory.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-ubi
-	DEVICE_TITLE := Linksys EA8500
+	BOARD_NAME := ap148
+	DEVICE_TITLE := Qualcomm AP148
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
-TARGET_DEVICES += linksys_ea8500
+TARGET_DEVICES += AP148
 
-define Device/netgear_d7800
+define Device/AP148-legacy
+	$(call Device/LegacyImage)
+	$(call Device/UbiFit)
+	DEVICE_DTS := qcom-ipq8064-ap148
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
+	BOARD_NAME := ap148
+	DEVICE_TITLE := Qualcomm AP148 (legacy)
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
+endef
+TARGET_DEVICES += AP148-legacy
+
+define Device/C2600
+	$(call Device/TpSafeImage)
+	DEVICE_DTS := qcom-ipq8064-c2600
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
+	BOARD_NAME := c2600
+	TPLINK_BOARD_ID := C2600
+	DEVICE_TITLE := TP-Link Archer C2600
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
+endef
+TARGET_DEVICES += C2600
+
+define Device/D7800
 	$(call Device/DniImage)
 	DEVICE_DTS := qcom-ipq8064-d7800
 	KERNEL_SIZE := 2097152
@@ -110,13 +144,55 @@ define Device/netgear_d7800
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	BOARD_NAME := d7800
-	SUPPORTED_DEVICES += d7800
 	DEVICE_TITLE := Netgear Nighthawk X4 D7800
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
-TARGET_DEVICES += netgear_d7800
+TARGET_DEVICES += D7800
 
-define Device/netgear_r7500
+define Device/DB149
+	$(call Device/FitImage)
+	DEVICE_DTS := qcom-ipq8064-db149
+	KERNEL_INSTALL := 1
+	BOARD_NAME := db149
+	DEVICE_TITLE := Qualcomm DB149
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
+endef
+TARGET_DEVICES += DB149
+
+define Device/EA8500
+	$(call Device/LegacyImage)
+	DEVICE_DTS := qcom-ipq8064-ea8500
+	PAGESIZE := 2048
+	BLOCKSIZE := 128k
+	KERNEL_SIZE := 3072k
+	FILESYSTEMS := squashfs
+	KERNEL = kernel-bin | append-dtb | uImage none | append-uImage-fakeroot-hdr
+	PROFILES += $$(DEVICE_NAME)
+	BOARD_NAME := ea8500
+	UBINIZE_OPTS := -E 5
+	IMAGES := factory.bin sysupgrade.tar
+	IMAGE/factory.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-ubi
+	DEVICE_TITLE := Linksys EA8500
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
+endef
+TARGET_DEVICES += EA8500
+
+define Device/FRITZ4040
+	$(call Device/FitImageLzma)
+	DEVICE_DTS := qcom-ipq4019-fritz4040
+	KERNEL_LOADADDR := 0x80208000
+	BLOCKSIZE := 4k
+	PAGESIZE := 256
+	BOARD_NAME := fritz4040
+	DEVICE_TITLE := AVM Fritz!Box 4040
+	IMAGE_SIZE := 29753344
+	IMAGES = sysupgrade.bin
+	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
+	DEVICE_PACKAGES := kmod-usb-phy-qcom-ipq4019 ipq-wifi-fritz4040 fritz-tffs fritz-caldata u-boot-fritz4040
+endef
+TARGET_DEVICES += FRITZ4040
+
+define Device/R7500
 	$(call Device/DniImage)
 	DEVICE_DTS := qcom-ipq8064-r7500
 	KERNEL_SIZE := 2097152
@@ -125,13 +201,12 @@ define Device/netgear_r7500
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	BOARD_NAME := r7500
-	SUPPORTED_DEVICES += r7500
 	DEVICE_TITLE := Netgear Nighthawk X4 R7500
 	DEVICE_PACKAGES := ath10k-firmware-qca988x
 endef
-TARGET_DEVICES += netgear_r7500
+TARGET_DEVICES += R7500
 
-define Device/netgear_r7500v2
+define Device/R7500v2
 	$(call Device/DniImage)
 	DEVICE_DTS := qcom-ipq8064-r7500v2
 	KERNEL_SIZE := 2097152
@@ -140,78 +215,39 @@ define Device/netgear_r7500v2
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	BOARD_NAME := r7500v2
-	SUPPORTED_DEVICES += r7500v2
 	DEVICE_TITLE := Netgear Nighthawk X4 R7500v2
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0 ath10k-firmware-qca988x
 endef
-TARGET_DEVICES += netgear_r7500v2
+TARGET_DEVICES += R7500v2
 
-define Device/netgear_r7800
+define Device/R7800
 	$(call Device/DniImage)
 	DEVICE_DTS := qcom-ipq8065-r7800
-	KERNEL_SIZE := 2097152
+	KERNEL_SIZE := 4194304
 	NETGEAR_BOARD_ID := R7800
 	NETGEAR_HW_ID := 29764958+0+128+512+4x4+4x4+cascade
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	BOARD_NAME := r7800
-	SUPPORTED_DEVICES += r7800
 	DEVICE_TITLE := Netgear Nighthawk X4S R7800
 	DEVICE_PACKAGES := ath10k-firmware-qca9984
 endef
-TARGET_DEVICES += netgear_r7800
+TARGET_DEVICES += R7800
 
-define Device/qcom_ipq8064-ap148
-	$(call Device/FitImage)
-	$(call Device/UbiFit)
-	DEVICE_DTS := qcom-ipq8064-ap148
-	KERNEL_INSTALL := 1
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	BOARD_NAME := ap148
-	SUPPORTED_DEVICES += ap148
-	DEVICE_TITLE := Qualcomm AP148
-	DEVICE_PACKAGES := ath10k-firmware-qca99x0
+define Device/NBG6817
+	DEVICE_DTS := qcom-ipq8065-nbg6817
+	KERNEL_SIZE := 4096k
+	BLOCKSIZE := 64k
+	BOARD_NAME := nbg6817
+	DEVICE_TITLE := ZyXEL NBG6817
+	DEVICE_PACKAGES := ath10k-firmware-qca9984 e2fsprogs kmod-fs-ext4 losetup
+	$(call Device/ZyXELImage)
 endef
-TARGET_DEVICES += qcom_ipq8064-ap148
+TARGET_DEVICES += NBG6817
 
-define Device/qcom_ipq8064-ap148-legacy
-	$(call Device/LegacyImage)
-	$(call Device/UbiFit)
-	DEVICE_DTS := qcom-ipq8064-ap148
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	BOARD_NAME := ap148
-	SUPPORTED_DEVICES := qcom,ipq8064-ap148 ap148
-	DEVICE_TITLE := Qualcomm AP148 (legacy)
-	DEVICE_PACKAGES := ath10k-firmware-qca99x0
-endef
-TARGET_DEVICES += qcom_ipq8064-ap148-legacy
-
-define Device/qcom_ipq8064-db149
-	$(call Device/FitImage)
-	DEVICE_DTS := qcom-ipq8064-db149
-	KERNEL_INSTALL := 1
-	BOARD_NAME := db149
-	DEVICE_TITLE := Qualcomm DB149
-	DEVICE_PACKAGES := ath10k-firmware-qca99x0
-endef
-TARGET_DEVICES += qcom_ipq8064-db149
-
-define Device/tplink_c2600
-	$(call Device/TpSafeImage)
-	DEVICE_DTS := qcom-ipq8064-c2600
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	BOARD_NAME := c2600
-	SUPPORTED_DEVICES += c2600
-	TPLINK_BOARD_ID := C2600
-	DEVICE_TITLE := TP-Link Archer C2600
-	DEVICE_PACKAGES := ath10k-firmware-qca99x0
-endef
-TARGET_DEVICES += tplink_c2600
-
-define Device/tplink_vr2600v
+define Device/VR2600v
+	PROFILES += $$(DEVICE_NAME)
+	FILESYSTEMS := squashfs
 	KERNEL_SUFFIX := -uImage
 	KERNEL = kernel-bin | append-dtb | uImage none
 	KERNEL_NAME := zImage
@@ -220,24 +256,42 @@ define Device/tplink_vr2600v
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	BOARD_NAME := vr2600v
-	SUPPORTED_DEVICES += vr2600v
 	DEVICE_TITLE := TP-Link Archer VR2600v
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 	IMAGES := sysupgrade.bin
 	IMAGE/sysupgrade.bin := pad-extra 512 | append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
 endef
-TARGET_DEVICES += tplink_vr2600v
+TARGET_DEVICES += VR2600v
 
-define Device/zyxel_nbg6817
-	DEVICE_DTS := qcom-ipq8065-nbg6817
+define Device/AP-DK01.1-C1
+	PROFILES += $$(DEVICE_NAME)
+	DEVICE_TITLE := QCA AP-DK01.1-C1
+	BOARD_NAME := ap-dk01.1-c1
+	DEVICE_DTS := qcom-ipq4019-ap.dk01.1-c1
+	KERNEL_LOADADDR := 0x80208000
+	KERNEL_INSTALL := 1
 	KERNEL_SIZE := 4096k
-	BLOCKSIZE := 64k
-	BOARD_NAME := nbg6817
-	SUPPORTED_DEVICES += nbg6817
-	DEVICE_TITLE := ZyXEL NBG6817
-	DEVICE_PACKAGES := ath10k-firmware-qca9984 e2fsprogs kmod-fs-ext4 losetup
-	$(call Device/ZyXELImage)
+	IMAGE_SIZE := 26624k
+	FILESYSTEMS := squashfs
+	$(call Device/FitImage)
+	IMAGES := sysupgrade.bin
+	IMAGE/sysupgrade.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
+	DEVICE_PACKAGES := ath10k-firmware-qca4019
 endef
-TARGET_DEVICES += zyxel_nbg6817
+TARGET_DEVICES += AP-DK01.1-C1
+
+define Device/AP-DK04.1-C1
+	$(call Device/FitImage)
+	$(call Device/UbiFit)
+	DEVICE_DTS := qcom-ipq4019-ap.dk04.1-c1
+	KERNEL_LOADADDR := 0x80208000
+	KERNEL_INSTALL := 1
+	KERNEL_SIZE := 4048k
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
+	BOARD_NAME := ap-dk04.1-c1
+	DEVICE_TITLE := QCA AP-DK04.1-C1
+endef
+TARGET_DEVICES += AP-DK04.1-C1
 
 $(eval $(call BuildImage))