From e670a939cd231db69d34aaa70a36892289af5cf1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Owoc?= Date: Thu, 15 Feb 2024 21:33:28 +0100 Subject: [PATCH] qualcommax: ipq807x: remove duplicated sysupgrade image definitions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Image sysupgrade.bin is defined by default and there is no need to define it. Signed-off-by: Paweł Owoc --- target/linux/qualcommax/image/Makefile | 5 ++--- target/linux/qualcommax/image/ipq807x.mk | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/target/linux/qualcommax/image/Makefile b/target/linux/qualcommax/image/Makefile index 8d3f16755bdf..c12fc9780754 100644 --- a/target/linux/qualcommax/image/Makefile +++ b/target/linux/qualcommax/image/Makefile @@ -25,16 +25,15 @@ define Device/FitImageLzma endef define Device/EmmcImage - IMAGES := factory.bin sysupgrade.bin + IMAGES += factory.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 + IMAGES += factory.ubi IMAGE/factory.ubi := append-ubi - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef include $(SUBTARGET).mk diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk index e68b53b0ef63..87c53dffdc4e 100644 --- a/target/linux/qualcommax/image/ipq807x.mk +++ b/target/linux/qualcommax/image/ipq807x.mk @@ -30,8 +30,6 @@ define Device/buffalo_wxr-5950ax12 PAGESIZE := 2048 DEVICE_DTS_CONFIG := config@hk01 SOC := ipq8074 - IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := ipq-wifi-buffalo_wxr-5950ax12 endef TARGET_DEVICES += buffalo_wxr-5950ax12 @@ -45,7 +43,7 @@ define Device/cmcc_rm2-6 PAGESIZE := 2048 DEVICE_DTS_CONFIG := config@ac02 SOC := ipq8070 - IMAGES := factory.bin sysupgrade.bin + IMAGES += factory.bin IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand DEVICE_PACKAGES := ipq-wifi-cmcc_rm2-6 kmod-hwmon-gpiofan endef @@ -144,7 +142,7 @@ define Device/netgear_rax120v2 NETGEAR_HW_ID := 29765589+0+512+1024+4x4+8x8 DEVICE_PACKAGES := ipq-wifi-netgear_rax120v2 kmod-spi-gpio \ kmod-spi-bitbang kmod-gpio-nxp-74hc164 kmod-hwmon-g761 - IMAGES := web-ui-factory.img sysupgrade.bin + IMAGES += web-ui-factory.img IMAGE/web-ui-factory.img := append-image initramfs-uImage.itb | \ pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem | \ netgear-dni @@ -196,7 +194,7 @@ define Device/netgear_wax630 BLOCKSIZE := 128k PAGESIZE := 2048 SOC := ipq8074 - IMAGES := ui-factory.tar factory.ubi sysupgrade.bin + IMAGES += ui-factory.tar IMAGE/ui-factory.tar := append-ubi | wax6xx-netgear-tar DEVICE_PACKAGES := kmod-spi-gpio ipq-wifi-netgear_wax630 endef -- 2.30.2