qualcommax: move generic image recipes to target Makefile

These recipes are generic and will be used for other subtargets, so lets
move them to the target Makefile so they can reused.

Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/image/Makefile b/target/linux/qualcommax/image/Makefile
index f59ad0c15fdb1c9d84d1772f6192311867371215..684169319457e4f524279efc18010f0df63cba46 100644 (file)
--- a/target/linux/qualcommax/image/Makefile
+++ b/target/linux/qualcommax/image/Makefile
@@ -12,6 +12,31 @@ define Device/Default
        IMAGE/sysupgrade.bin/squashfs :=
 endef
 
+define Device/FitImage
+       KERNEL_SUFFIX := -uImage.itb
+       KERNEL = kernel-bin | libdeflate-gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
+       KERNEL_NAME := Image
+endef
+
+define Device/FitImageLzma
+       KERNEL_SUFFIX := -uImage.itb
+       KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb
+       KERNEL_NAME := Image
+endef
+
+define Device/EmmcImage
+       IMAGES += factory.bin sysupgrade.bin
+       IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k
+       IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to 64k | sysupgrade-tar rootfs=$$$$@ | append-metadata
+endef
+
+define Device/UbiFit
+       KERNEL_IN_UBI := 1
+       IMAGES := factory.ubi sysupgrade.bin
+       IMAGE/factory.ubi := append-ubi
+       IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+endef
+
 include $(SUBTARGET).mk
 
 $(eval $(call BuildImage))

diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk
index f5f0e261405b4250deee8004f95aa4fddd2010b4..3a30b161b42195ae0f457e674a2e3c93992e637d 100644 (file)
--- a/target/linux/qualcommax/image/ipq807x.mk
+++ b/target/linux/qualcommax/image/ipq807x.mk
@@ -1,28 +1,3 @@
-define Device/FitImage
-       KERNEL_SUFFIX := -uImage.itb
-       KERNEL = kernel-bin | libdeflate-gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
-       KERNEL_NAME := Image
-endef
-
-define Device/FitImageLzma
-       KERNEL_SUFFIX := -uImage.itb
-       KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb
-       KERNEL_NAME := Image
-endef
-
-define Device/EmmcImage
-       IMAGES += factory.bin sysupgrade.bin
-       IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k
-       IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to 64k | sysupgrade-tar rootfs=$$$$@ | append-metadata
-endef
-
-define Device/UbiFit
-       KERNEL_IN_UBI := 1
-       IMAGES := factory.ubi sysupgrade.bin
-       IMAGE/factory.ubi := append-ubi
-       IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-endef
-
 define Build/wax6xx-netgear-tar
        mkdir $@.tmp
        mv $@ $@.tmp/nand-ipq807x-apps.img