[openwrt/openwrt] qualcommax: move generic image recipes to target Makefile
LEDE Commits
lede-commits at lists.infradead.org
Fri Feb 9 05:02:05 PST 2024
ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/fe98cc1baf85c0a05bc8d8b8743cc4ff85092892
commit fe98cc1baf85c0a05bc8d8b8743cc4ff85092892
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Sat Oct 14 20:15:22 2023 +0200
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 at gmail.com>
---
target/linux/qualcommax/image/Makefile | 25 +++++++++++++++++++++++++
target/linux/qualcommax/image/ipq807x.mk | 25 -------------------------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/target/linux/qualcommax/image/Makefile b/target/linux/qualcommax/image/Makefile
index f59ad0c15f..6841693194 100644
--- 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 f5f0e26140..3a30b161b4 100644
--- 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
More information about the lede-commits
mailing list