From: Tomasz Maciej Nowak <[email protected]> Every fit command usage in tree points to Device Tree blob. Shorten the invocation, to remove unnecessary repetition, by hardcoding default path, where particular device dtb name is sourced from DEVICE_DTS variable.
Signed-off-by: Tomasz Maciej Nowak <[email protected]> --- include/image-commands.mk | 16 +- target/linux/airoha/image/Makefile | 6 +- target/linux/airoha/image/an7581.mk | 6 +- target/linux/airoha/image/an7583.mk | 2 +- target/linux/at91/image/Makefile | 4 +- target/linux/bcm53xx/image/Makefile | 9 +- target/linux/d1/image/Makefile | 4 +- target/linux/ipq40xx/image/chromium.mk | 2 +- target/linux/ipq40xx/image/generic.mk | 22 +- target/linux/ipq806x/image/Makefile | 4 +- target/linux/ipq806x/image/chromium.mk | 2 +- target/linux/layerscape/image/armv7.mk | 4 +- target/linux/layerscape/image/armv8_64b.mk | 8 +- target/linux/mediatek/image/Makefile | 6 +- target/linux/mediatek/image/filogic.mk | 268 ++++++++++----------- target/linux/mediatek/image/mt7622.mk | 30 +-- target/linux/mediatek/image/mt7623.mk | 8 +- target/linux/microchipsw/image/Makefile | 2 +- target/linux/mpc85xx/image/p1010.mk | 6 +- target/linux/mpc85xx/image/p1020.mk | 6 +- target/linux/mpc85xx/image/p2020.mk | 5 +- target/linux/mvebu/image/Makefile | 2 +- target/linux/mvebu/image/cortexa9.mk | 2 +- target/linux/pistachio/image/Makefile | 2 +- target/linux/qoriq/image/generic.mk | 4 +- target/linux/qualcommax/image/Makefile | 4 +- target/linux/qualcommax/image/ipq807x.mk | 2 +- target/linux/qualcommbe/image/Makefile | 4 +- target/linux/ramips/image/mt7621.mk | 74 +++--- target/linux/rockchip/image/Makefile | 2 +- target/linux/siflower/image/sf21.mk | 8 +- target/linux/sunxi/image/Makefile | 4 +- target/linux/zynq/image/Makefile | 2 +- 33 files changed, 259 insertions(+), 271 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 443c870a8ec3..fb5ad8e51e0e 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -431,18 +431,16 @@ define Build/initrd_compression endef define Build/fit-its - $(if $(findstring with-rootfs,$(word 3,$(1))), \ + $(if $(findstring with-rootfs,$(word 2,$(1))), \ $(call locked,dd if=$(IMAGE_ROOTFS) of=$(IMAGE_ROOTFS).pagesync bs=4096 conv=sync, \ gen-cpio$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME))))) $(TOPDIR)/scripts/mkits.sh \ -D $(DEVICE_NAME) -o [email protected] -k $@ \ -C $(word 1,$(1)) \ - $(if $(word 2,$(1)),\ - $(if $(findstring 11,$(if $(DEVICE_DTS_OVERLAY),1)$(if $(findstring $(KERNEL_BUILD_DIR)/image-,$(word 2,$(1))),,1)), \ - -d $(KERNEL_BUILD_DIR)/image-$$(basename $(word 2,$(1))), \ - -d $(word 2,$(1)))) \ - $(if $(findstring with-rootfs,$(word 3,$(1))),-r $(IMAGE_ROOTFS)) \ - $(if $(findstring with-initrd,$(word 3,$(1))), \ + $(if $(DEVICE_DTS),\ + -d $(KERNEL_BUILD_DIR)/image-$$(basename $(firstword $(DEVICE_DTS)).dtb)) \ + $(if $(findstring with-rootfs,$(word 2,$(1))),-r $(IMAGE_ROOTFS)) \ + $(if $(findstring with-initrd,$(word 2,$(1))), \ $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE), \ -i $(KERNEL_BUILD_DIR)/initrd$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME))).cpio$(strip $(call Build/initrd_compression)))) \ -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ @@ -455,8 +453,8 @@ define Build/fit-its endef define Build/fit-image - $(call locked,PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(findstring external,$(word 3,$(1))),\ - -E -B 0x1000 $(if $(findstring static,$(word 3,$(1))),-p 0x1000)) -f [email protected] [email protected], \ + $(call locked,PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(findstring external,$(word 2,$(1))),\ + -E -B 0x1000 $(if $(findstring static,$(word 2,$(1))),-p 0x1000)) -f [email protected] [email protected], \ gen-cpio$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME)))) @mv [email protected] $@ endef diff --git a/target/linux/airoha/image/Makefile b/target/linux/airoha/image/Makefile index 52fcaaad54dc..45f30989d54f 100644 --- a/target/linux/airoha/image/Makefile +++ b/target/linux/airoha/image/Makefile @@ -9,10 +9,8 @@ loadaddr-$(CONFIG_TARGET_airoha_en7523) := 0x80200000 define Device/Default PROFILES = Default $$(DEVICE_NAME) KERNEL_NAME := Image - KERNEL = kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb - KERNEL_INITRAMFS = kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL = kernel-bin | lzma | fit lzma + KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma KERNEL_LOADADDR = $(loadaddr-y) FILESYSTEMS := squashfs DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) diff --git a/target/linux/airoha/image/an7581.mk b/target/linux/airoha/image/an7581.mk index 7323eba0da03..fa003c4e472f 100644 --- a/target/linux/airoha/image/an7581.mk +++ b/target/linux/airoha/image/an7581.mk @@ -41,7 +41,7 @@ endef define Device/FitImageLzma KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma KERNEL_NAME := Image endef @@ -111,10 +111,10 @@ define Device/gemtek_w1700k-ubi KERNEL_IN_UBI := 1 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 128k + fit lzma with-initrd | pad-to 128k KERNEL_INITRAMFS_SUFFIX := -recovery.itb IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := chainload-uboot.itb ARTIFACT/chainload-uboot.itb := an7581-chainloader gemtek_w1700k SOC := an7581 diff --git a/target/linux/airoha/image/an7583.mk b/target/linux/airoha/image/an7583.mk index bbc78c65ae4a..42c10255a31f 100644 --- a/target/linux/airoha/image/an7583.mk +++ b/target/linux/airoha/image/an7583.mk @@ -1,6 +1,6 @@ define Device/FitImageLzma KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma KERNEL_NAME := Image endef diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index b825a4124730..bba4f8e08a84 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -55,13 +55,13 @@ define Device/evaluation-dtb $(Device/evaluation) $(Device/dtb) KERNEL_SUFFIX := -fit-zImage.itb - KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip endef define Device/evaluation-fit $(Device/evaluation) KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma endef define Device/production diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index 1327e252fe29..a8863f586c49 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -425,9 +425,8 @@ define Device/meraki_mr32 KERNEL_INITRAMFS_SUFFIX := .bin DEVICE_DTS_DELIMITER := @ DEVICE_DTS_CONFIG := config@1 - KERNEL_INITRAMFS := kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb | \ - pad-to 10362880 - KERNEL := kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL_INITRAMFS := kernel-bin | fit none | pad-to 10362880 + KERNEL := kernel-bin | fit none IMAGES += sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata @@ -444,8 +443,8 @@ define Device/meraki_mx6x DEVICE_PACKAGES := -oseama kmod-leds-pwm kmod-usb-ehci \ kmod-usb-ohci kmod-usb2 DEVICE_VENDOR := Cisco Meraki - KERNEL = kernel-bin | libdeflate-gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb - KERNEL_INITRAMFS := kernel-bin | libdeflate-gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | libdeflate-gzip | fit gzip + KERNEL_INITRAMFS := kernel-bin | libdeflate-gzip | fit gzip KERNEL_INITRAMFS_SUFFIX := .bin IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata diff --git a/target/linux/d1/image/Makefile b/target/linux/d1/image/Makefile index b5e64c021831..5ebcc538b6ca 100644 --- a/target/linux/d1/image/Makefile +++ b/target/linux/d1/image/Makefile @@ -39,13 +39,13 @@ endef define Device/FitImageGzip KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip KERNEL_NAME := Image endef define Device/FitImage KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | fit none KERNEL_NAME := Image endef diff --git a/target/linux/ipq40xx/image/chromium.mk b/target/linux/ipq40xx/image/chromium.mk index 68a239bf3477..be1ca968c881 100644 --- a/target/linux/ipq40xx/image/chromium.mk +++ b/target/linux/ipq40xx/image/chromium.mk @@ -28,7 +28,7 @@ define Device/google_wifi DEVICE_MODEL := WiFi (Gale) SOC := qcom-ipq4019 KERNEL_SUFFIX := -fit-zImage.itb.vboot - KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb | cros-vboot + KERNEL = kernel-bin | fit none | cros-vboot KERNEL_NAME := zImage IMAGES += factory.bin IMAGE/factory.bin := cros-gpt | append-kernel-part | append-rootfs diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 7738eca6e3c0..2c2ba9af4bf9 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -12,19 +12,19 @@ endef define Device/FitImage KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip KERNEL_NAME := Image endef define Device/FitImageLzma KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma KERNEL_NAME := Image endef define Device/FitzImage KERNEL_SUFFIX := -zImage.itb - KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | fit none KERNEL_NAME := zImage endef @@ -317,8 +317,8 @@ TARGET_DEVICES += buffalo_wtr-m2133hp define Device/cellc_rtl30vw KERNEL_SUFFIX := -zImage.itb - KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb - KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb | uImage lzma | pad-to 2048 + KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip + KERNEL = kernel-bin | fit none | uImage lzma | pad-to 2048 KERNEL_NAME := zImage KERNEL_IN_UBI := IMAGES := factory.bin sysupgrade.bin @@ -386,7 +386,7 @@ define Device/devolo_magic-2-wifi-next # If the bootloader sees 0xDEADC0DE and this trailer at the 64k boundary of a TFTP image # it will bootm it, just like we want for the initramfs. - KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to 64k |\ + KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip | pad-to 64k |\ append-string -e '\xDE\xAD\xC0\xDE{"fl_initramfs":""}\x00' IMAGE_SIZE := 26624k @@ -651,7 +651,7 @@ define Device/huawei_ap4050dn SOC := qcom-ipq4018 IMAGE_SIZE := 51200k DEVICE_PACKAGES := ipq-wifi-huawei_ap4050dn - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata endef TARGET_DEVICES += huawei_ap4050dn @@ -1108,7 +1108,7 @@ define Device/openmesh_a42 SOC := qcom-ipq4018 DEVICE_DTS_CONFIG := [email protected] BLOCKSIZE := 64k - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) + KERNEL = kernel-bin | lzma | fit lzma | pad-to $$(BLOCKSIZE) IMAGE_SIZE := 15616k IMAGES += factory.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A42 @@ -1123,7 +1123,7 @@ define Device/openmesh_a62 SOC := qcom-ipq4019 DEVICE_DTS_CONFIG := [email protected] BLOCKSIZE := 64k - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) + KERNEL = kernel-bin | lzma | fit lzma | pad-to $$(BLOCKSIZE) IMAGE_SIZE := 15552k IMAGES += factory.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A62 @@ -1176,7 +1176,7 @@ define Device/plasmacloud_pa1200 SOC := qcom-ipq4018 DEVICE_DTS_CONFIG := [email protected] BLOCKSIZE := 64k - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) + KERNEL = kernel-bin | lzma | fit lzma | pad-to $$(BLOCKSIZE) IMAGE_SIZE := 15616k IMAGES += factory.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA1200 @@ -1191,7 +1191,7 @@ define Device/plasmacloud_pa2200 SOC := qcom-ipq4019 DEVICE_DTS_CONFIG := [email protected] BLOCKSIZE := 64k - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) + KERNEL = kernel-bin | lzma | fit lzma | pad-to $$(BLOCKSIZE) IMAGE_SIZE := 15552k IMAGES += factory.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA2200 diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 834d4d6fac64..8812eba7af2d 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -22,13 +22,13 @@ endef define Device/FitImage KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip KERNEL_NAME := Image endef define Device/FitImageLzma KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma KERNEL_NAME := Image endef diff --git a/target/linux/ipq806x/image/chromium.mk b/target/linux/ipq806x/image/chromium.mk index 563bc70e3365..4418b546bad2 100644 --- a/target/linux/ipq806x/image/chromium.mk +++ b/target/linux/ipq806x/image/chromium.mk @@ -38,7 +38,7 @@ define Device/OnhubImage SOC := qcom-ipq8064 KERNEL_SUFFIX := -fit-zImage.itb.vboot KERNEL_NAME := zImage - KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb | cros-vboot + KERNEL = kernel-bin | fit none | cros-vboot IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := cros-gpt | append-kernel-part | append-rootfs IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata diff --git a/target/linux/layerscape/image/armv7.mk b/target/linux/layerscape/image/armv7.mk index 6caccae6c365..dc4e203a1059 100644 --- a/target/linux/layerscape/image/armv7.mk +++ b/target/linux/layerscape/image/armv7.mk @@ -8,7 +8,7 @@ define Device/Default IMAGES := firmware.bin sysupgrade.bin DEVICE_DTS_DIR := $(DTS_DIR)/nxp/ls KERNEL := kernel-bin | uImage none - KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip KERNEL_NAME := zImage KERNEL_LOADADDR := 0x80008000 DEVICE_DTS = $(lastword $(subst _, ,$(1))) @@ -21,7 +21,7 @@ define Device/Default endef define Device/fsl-sdboot - KERNEL = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip IMAGES := sdcard.img.gz sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk index 81b7e86c11a3..1971da96c3fb 100644 --- a/target/linux/layerscape/image/armv8_64b.mk +++ b/target/linux/layerscape/image/armv8_64b.mk @@ -9,7 +9,7 @@ define Device/Default DEVICE_DTS = $(subst _,-,$(1)) FILESYSTEMS := squashfs KERNEL := kernel-bin | gzip | uImage gzip - KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip KERNEL_LOADADDR := 0x80000000 IMAGE_SIZE := 64m IMAGE/sysupgrade.bin = \ @@ -20,7 +20,7 @@ define Device/Default endef define Device/fsl-sdboot - KERNEL = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip IMAGES := sdcard.img.gz sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef @@ -45,7 +45,7 @@ define Device/fsl_ls1012a-frdm append-kernel | pad-to $$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | \ check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata - KERNEL := kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL := kernel-bin | gzip | fit gzip endef TARGET_DEVICES += fsl_ls1012a-frdm @@ -100,7 +100,7 @@ define Device/fsl_ls1028a-rdb DEVICE_VENDOR := NXP DEVICE_MODEL := LS1028A-RDB DEVICE_VARIANT := Default - KERNEL = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip DEVICE_PACKAGES += \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 \ diff --git a/target/linux/mediatek/image/Makefile b/target/linux/mediatek/image/Makefile index 711ec84ccaa8..549e269ead3d 100644 --- a/target/linux/mediatek/image/Makefile +++ b/target/linux/mediatek/image/Makefile @@ -17,10 +17,8 @@ loadaddr-$(CONFIG_TARGET_mediatek_filogic) := 0x48000000 define Device/Default PROFILES = Default $$(DEVICE_NAME) KERNEL_NAME := Image - KERNEL = kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb - KERNEL_INITRAMFS = kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd + KERNEL = kernel-bin | lzma | fit lzma + KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma with-initrd KERNEL_LOADADDR = $(loadaddr-y) FILESYSTEMS := squashfs erofs DEVICE_DTS_DIR := $(DTS_DIR) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 2eb91e2c7ff5..2116e02f3ecf 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -161,9 +161,9 @@ define Device/abt_asr3000 KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot abt_asr3000 @@ -196,7 +196,7 @@ define Device/acer_predator-w6 DEVICE_PACKAGES := kmod-usb3 kmod-mt7915e kmod-mt7916-firmware kmod-mt7986-firmware mt7986-wo-firmware e2fsprogs f2fsck mkf2fs IMAGES := sysupgrade.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += acer_predator-w6 @@ -210,7 +210,7 @@ define Device/acer_predator-w6d DEVICE_PACKAGES := kmod-usb3 kmod-mt7915e kmod-mt7916-firmware kmod-mt7986-firmware mt7986-wo-firmware e2fsprogs f2fsck mkf2fs IMAGES := sysupgrade.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += acer_predator-w6d @@ -227,7 +227,7 @@ define Device/acer_predator-w6x-stock DEVICE_PACKAGES := kmod-usb3 kmod-leds-ws2812b kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware IMAGES := sysupgrade.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += acer_predator-w6x-stock @@ -247,9 +247,9 @@ define Device/acer_predator-w6x-ubootmod UBOOTENV_IN_UBI := 1 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7986-bl2 spim-nand-ddr4 ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot acer_predator-w6x @@ -265,7 +265,7 @@ define Device/acer_vero-w6m DEVICE_PACKAGES := kmod-leds-ktd202x kmod-mt7915e kmod-mt7916-firmware kmod-mt7986-firmware mt7986-wo-firmware e2fsprogs f2fsck mkf2fs IMAGES := sysupgrade.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += acer_vero-w6m @@ -377,7 +377,7 @@ define Device/airpi_ap3000m DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware \ kmod-hwmon-pwmfan kmod-usb3 f2fsck mkf2fs KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += airpi_ap3000m @@ -393,11 +393,11 @@ define Device/arcadyan_mozart KERNEL_LOADADDR := 0x46000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := .itb IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := emmc-preloader.bin emmc-bl31-uboot.fip emmc-gpt.bin ARTIFACT/emmc-gpt.bin := mt7988-mozart-gpt ARTIFACT/emmc-preloader.bin := mt7988-bl2 emmc-comb @@ -416,7 +416,7 @@ define Device/asus_rt-ax52 DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware IMAGES := sysupgrade.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata ifeq ($(IB),) ARTIFACTS := initramfs.trx @@ -445,7 +445,7 @@ define Device/asus_rt-ax57m DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware IMAGES := sysupgrade.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata ifeq ($(IB),) ARTIFACTS := initramfs.trx @@ -474,7 +474,7 @@ define Device/asus_tuf-ax4200 DEVICE_PACKAGES := kmod-usb3 kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware IMAGES := sysupgrade.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) @@ -497,7 +497,7 @@ define Device/asus_tuf-ax4200q DEVICE_PACKAGES := kmod-usb3 kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware IMAGES := sysupgrade.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata ifeq ($(IB),) ifeq ($(CONFIG_TARGET_INITRAMFS_FORCE),y) @@ -518,7 +518,7 @@ define Device/asus_tuf-ax6000 DEVICE_PACKAGES := kmod-usb3 kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware IMAGES := sysupgrade.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += asus_tuf-ax6000 @@ -529,10 +529,9 @@ define Device/asus_zenwifi-bt8 DEVICE_DTS := mt7988d-asus-zenwifi-bt8 DEVICE_DTS_DIR := ../dts DEVICE_PACKAGES := kmod-usb3 mt7988-2p5g-phy-firmware kmod-mt7996-firmware mt7988-wo-firmware - KERNEL := kernel-bin | gzip | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | gzip | fit gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_LOADADDR := 0x48080000 IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata @@ -558,13 +557,13 @@ define Device/asus_zenwifi-bt8-ubootmod ARTIFACT/bl31-uboot.fip := mt7988-bl31-uboot asus_zenwifi-bt8 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL_LOADADDR := 0x46000000 KERNEL_IN_UBI := 1 UBOOTENV_IN_UBI := 1 IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-with-rootfs | pad-rootfs | append-metadata endef TARGET_DEVICES += asus_zenwifi-bt8-ubootmod @@ -617,8 +616,8 @@ ifeq ($(DUMP),) endif KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | pad-rootfs | append-metadata + fit lzma with-initrd | pad-to 64k + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-static-with-rootfs | pad-rootfs | append-metadata DEVICE_DTC_FLAGS := --pad 4096 DEVICE_COMPAT_VERSION := 1.3 DEVICE_COMPAT_MESSAGE := First sfp port renamed from eth1 to sfp1 @@ -637,7 +636,7 @@ define Device/bananapi_bpi-r3-mini KERNEL_LOADADDR := 0x44000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := -recovery.itb BLOCKSIZE := 128k PAGESIZE := 2048 @@ -648,7 +647,7 @@ ifeq ($(DUMP),) IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m endif IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ pad-rootfs | append-metadata ARTIFACTS := \ emmc-gpt.bin emmc-preloader.bin emmc-bl31-uboot.fip \ @@ -728,8 +727,8 @@ define Device/bananapi_bpi-r4-common IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + fit lzma with-initrd | pad-to 64k + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-with-rootfs | pad-rootfs | append-metadata endef define Device/bananapi_bpi-r4 @@ -770,12 +769,12 @@ define Device/bananapi_bpi-r4-lite KERNEL_LOADADDR := 0x40000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := sysupgrade.itb KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL_IN_UBI := 1 IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := \ emmc-preloader.bin emmc-bl31-uboot.fip \ nor-preloader.bin nor-bl31-uboot.fip \ @@ -824,9 +823,9 @@ define Device/bazis_ax3000wm KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ append-metadata DEVICE_PACKAGES := kmod-usb3 kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware ARTIFACTS := preloader.bin bl31-uboot.fip @@ -917,9 +916,9 @@ define Device/cmcc_a10-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot cmcc_a10 @@ -941,14 +940,14 @@ define Device/cmcc_rax3000m KERNEL_LOADADDR := 0x44000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL_IN_UBI := 1 UBOOTENV_IN_UBI := 1 IMAGES := sysupgrade.itb IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ pad-rootfs | append-metadata ARTIFACTS := emmc-gpt.bin \ emmc-ddr3-bl31-uboot.fip emmc-ddr3-preloader.bin \ @@ -1017,9 +1016,9 @@ define Device/comfast_cf-wr632ax-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3-1866 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot comfast_cf-wr632ax @@ -1034,10 +1033,8 @@ define Device/comfast_cf-xr186 DEVICE_DTS_DIR := ../dts SUPPORTED_DEVICES += cf-xr186 DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware - KERNEL := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb - KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd + KERNEL := kernel-bin | lzma | fit lzma + KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma with-initrd UBINIZE_OPTS := -E 5 BLOCKSIZE := 128k PAGESIZE := 2048 @@ -1166,7 +1163,7 @@ define Device/cudy_m3000-v1 IMAGE_SIZE := 65536k KERNEL_IN_UBI := 1 KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware @@ -1186,7 +1183,7 @@ define Device/cudy_m3000-v2-yt8821 IMAGE_SIZE := 65536k KERNEL_IN_UBI := 1 KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware kmod-phy-motorcomm @@ -1204,7 +1201,7 @@ define Device/cudy_re3000-v1 IMAGE_SIZE := 15424k SUPPORTED_DEVICES += R36 KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs | check-size | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware endef @@ -1260,9 +1257,9 @@ define Device/cudy_tr3000-v1-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 cudy-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot cudy_tr3000-v1 @@ -1280,7 +1277,7 @@ define Device/cudy_wr3000-v1 IMAGE_SIZE := 15424k SUPPORTED_DEVICES += R31 KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs | check-size | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware endef @@ -1319,9 +1316,9 @@ define Device/cudy_wr3000e-v1-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 cudy-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot cudy_wr3000e-v1 @@ -1361,9 +1358,9 @@ define Device/cudy_wr3000s-v1-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 cudy-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot cudy_wr3000s-v1 @@ -1403,9 +1400,9 @@ define Device/cudy_wr3000h-v1-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 cudy-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot cudy_wr3000h-v1 @@ -1445,9 +1442,9 @@ define Device/cudy_wr3000p-v1-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 cudy-ddr4 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot cudy_wr3000p-v1 @@ -1487,9 +1484,9 @@ define Device/cudy_wbr3000uax-v1-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 cudy-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot cudy_wbr3000uax-v1 @@ -1637,8 +1634,8 @@ define Device/gatonetworks_gdsp append-image squashfs-sysupgrade.itb | check-size | gzip KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | pad-rootfs | append-metadata + fit lzma with-initrd | pad-to 64k + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-static-with-rootfs | pad-rootfs | append-metadata endef TARGET_DEVICES += gatonetworks_gdsp @@ -1762,12 +1759,12 @@ define Device/globitel_bt-r320 KERNEL_LOADADDR := 0x44000000 KERNEL := kernel-bin | lzma KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := -initramfs-recovery.itb IMAGES := sysupgrade.itb IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m IMAGE/sysupgrade.itb := append-kernel | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit lzma external-static-with-rootfs | \ pad-rootfs | append-metadata ARTIFACTS := gpt.bin preloader.bin bl31-uboot.fip ARTIFACT/gpt.bin := mt798x-gpt emmc @@ -1791,9 +1788,9 @@ define Device/h3c_magic-nx30-pro KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3 @@ -1810,7 +1807,7 @@ define Device/huasifei_wh3000 kmod-usb3 f2fsck mkf2fs SUPPORTED_DEVICES += huasifei,wh3000-emmc KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += huasifei_wh3000 @@ -1825,7 +1822,7 @@ define Device/huasifei_wh3000-pro-emmc kmod-hwmon-pwmfan kmod-usb3 f2fsck mkf2fs SUPPORTED_DEVICES += huasifei,wh3000-pro KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += huasifei_wh3000-pro-emmc @@ -1875,9 +1872,9 @@ define Device/imou_hx21 KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot imou_hx21 @@ -1893,7 +1890,7 @@ define Device/iptime_ax3000q PAGESIZE := 2048 IMAGE_SIZE := 32768k KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := sysupgrade-tar | append-metadata | check-size | iptime-crc32 ax3000q IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata @@ -1911,7 +1908,7 @@ define Device/iptime_ax3000se PAGESIZE := 2048 IMAGE_SIZE := 32768k KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := sysupgrade.bin IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := sysupgrade-tar | append-metadata | check-size | iptime-crc32 ax3kse @@ -1930,7 +1927,7 @@ define Device/iptime_ax3000sm PAGESIZE := 2048 IMAGE_SIZE := 32768k KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := sysupgrade-tar | append-metadata | check-size | iptime-crc32 ax3ksm IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata @@ -1948,7 +1945,7 @@ define Device/iptime_ax3000m PAGESIZE := 2048 IMAGE_SIZE := 32768k KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := sysupgrade-tar | append-metadata | check-size | iptime-crc32 ax3000m IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata @@ -1966,7 +1963,7 @@ define Device/iptime_ax7800m-6e PAGESIZE := 2048 IMAGE_SIZE := 32768k KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := sysupgrade-tar | append-metadata | check-size | iptime-crc32 ax7800m IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata @@ -1989,9 +1986,9 @@ define Device/jcg_q30-pro KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3 @@ -2011,12 +2008,12 @@ define Device/jdcloud_re-cp-03 KERNEL_LOADADDR := 0x44000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := -recovery.itb IMAGES := sysupgrade.itb IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ pad-rootfs | append-metadata ARTIFACTS :=gpt.bin preloader.bin bl31-uboot.fip ARTIFACT/gpt.bin := mt798x-gpt emmc @@ -2062,7 +2059,7 @@ define Device/keenetic_kap-630-common PAGESIZE := 2048 KERNEL_SIZE := 6144k IMAGE_SIZE := 108544k - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + KERNEL := kernel-bin | lzma | fit lzma | \ append-squashfs4-fakeroot IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGES += factory.bin @@ -2089,7 +2086,7 @@ define Device/keenetic_kn-1812-common PAGESIZE := 2048 KERNEL_SIZE := 6144k IMAGE_SIZE := 229888k - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + KERNEL := kernel-bin | lzma | fit lzma | \ append-squashfs4-fakeroot IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGES += factory.bin @@ -2117,7 +2114,7 @@ define Device/keenetic_kn-3711 PAGESIZE := 2048 KERNEL_SIZE := 6144k IMAGE_SIZE := 108544k - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + KERNEL := kernel-bin | lzma | fit lzma | \ append-squashfs4-fakeroot IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | \ @@ -2137,7 +2134,7 @@ define Device/keenetic_kn-3811 PAGESIZE := 2048 KERNEL_SIZE := 6144k IMAGE_SIZE := 233984k - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + KERNEL := kernel-bin | lzma | fit lzma | \ append-squashfs4-fakeroot IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | \ @@ -2157,7 +2154,7 @@ define Device/keenetic_kn-3911 PAGESIZE := 2048 KERNEL_SIZE := 6144k IMAGE_SIZE := 108544k - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + KERNEL := kernel-bin | lzma | fit lzma | \ append-squashfs4-fakeroot IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | \ @@ -2185,9 +2182,9 @@ define Device/konka_komi-a31 KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot konka_komi-a31 @@ -2209,13 +2206,13 @@ define Device/mediatek_mt7981-rfb KERNEL_LOADADDR := 0x44000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := .itb KERNEL_IN_UBI := 1 UBOOTENV_IN_UBI := 1 IMAGES := sysupgrade.itb IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := \ emmc-preloader.bin emmc-bl31-uboot.fip \ nor-preloader.bin nor-bl31-uboot.fip \ @@ -2310,13 +2307,13 @@ define Device/mediatek_mt7987a-rfb KERNEL_LOADADDR := 0x40000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := sysupgrade.itb KERNEL_INITRAMFS_SUFFIX := .itb KERNEL_IN_UBI := 1 IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := \ snand-preloader.bin \ snand-bl31-uboot.fip \ @@ -2361,12 +2358,12 @@ define Device/mediatek_mt7988a-rfb KERNEL_LOADADDR := 0x46000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := .itb KERNEL_IN_UBI := 1 IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := \ emmc-gpt.bin emmc-preloader.bin emmc-bl31-uboot.fip \ nor-preloader.bin nor-bl31-uboot.fip \ @@ -2457,10 +2454,10 @@ define Device/mercusys_mr90x-v1-ubi KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | \ + fit lzma with-initrd | \ pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | \ + fit gzip external-with-rootfs | \ append-metadata ARTIFACTS := bl31-uboot.fip preloader.bin ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot mercusys_mr90x-v1 @@ -2482,9 +2479,9 @@ define Device/netcore_n60 KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7986-bl2 spim-nand-ddr3 @@ -2509,9 +2506,9 @@ define Device/netcore_n60-pro KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware kmod-usb3 ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7986-bl2 spim-nand-ddr4 @@ -2568,7 +2565,7 @@ define Device/netgear_eax17 NETGEAR_ENC_MODEL_LIST := EAX17;EAX11v3;EAX15v3;EAX14v3;EAX12v2;EAX16;EAX19 DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware KERNEL = kernel-bin | lzma | \ - fit-with-netgear-top-level-rootfs-node lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit-with-netgear-top-level-rootfs-node lzma KERNEL_IN_UBI := 1 IMAGE_SIZE := 81920k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata @@ -2611,9 +2608,9 @@ define Device/netis_eap930-v1 KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware ARTIFACTS := preloader.bin bl31-uboot.fip @@ -2643,13 +2640,13 @@ define Device/netis_nx30v2 DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware KERNEL_LOADADDR := 0x44000000 KERNEL := kernel-bin | gzip - KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := .itb KERNEL_IN_UBI := 1 UBOOTENV_IN_UBI := 1 IMAGES := sysupgrade.itb IMAGE_SIZE := 117248k - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := spim-nand-preloader.bin spim-nand-bl31-uboot.fip ARTIFACT/spim-nand-preloader.bin := mt7981-bl2 spim-nand-ddr3 ARTIFACT/spim-nand-bl31-uboot.fip := mt7981-bl31-uboot netis_nx30v2 @@ -2670,9 +2667,9 @@ define Device/netis_nx31 KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware ARTIFACTS := preloader.bin bl31-uboot.fip @@ -2695,9 +2692,9 @@ define Device/netis_nx32u KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware \ kmod-usb3 kmod-usb-ledtrig-usbport @@ -2722,9 +2719,9 @@ define Device/nokia_ea0326gmp KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot nokia_ea0326gmp @@ -2771,7 +2768,7 @@ define Device/openfi_6c DEVICE_DTS_DIR := ../dts DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware kmod-usb3 KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += openfi_6c @@ -2787,13 +2784,13 @@ define Device/openwrt_one KERNEL_LOADADDR := 0x44000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := .itb KERNEL_IN_UBI := 1 UBOOTENV_IN_UBI := 1 IMAGES := sysupgrade.itb IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := \ nor-preloader.bin nor-bl31-uboot.fip \ snand-preloader.bin snand-bl31-uboot.fip \ @@ -2834,10 +2831,10 @@ define Device/qihoo_360t7-common KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | \ + fit lzma with-initrd | \ pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware ARTIFACTS := bl31-uboot.fip preloader.bin @@ -2891,9 +2888,9 @@ define Device/routerich_ax3000-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware kmod-usb3 mt7981-wo-firmware ARTIFACTS := preloader.bin bl31-uboot.fip @@ -2929,10 +2926,10 @@ define Device/routerich_be7200 KERNEL_LOADADDR := 0x40000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | \ + fit lzma with-initrd | \ pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | \ + fit gzip external-with-rootfs | \ pad-rootfs | append-metadata DEVICE_PACKAGES := mt7987-2p5g-phy-firmware kmod-mt7992-firmware \ kmod-regulator-userspace-consumer kmod-usb3 @@ -2966,9 +2963,9 @@ define Device/snr_snr-cpe-ax2 KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware ARTIFACTS := preloader.bin bl31-uboot.fip @@ -3023,7 +3020,7 @@ define Device/tenda_be12-pro PAGESIZE := 2048 KERNEL_LOADADDR := 0x40000000 KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := append-kernel | tenda-mkdualimageheader | sysupgrade-tar kernel=$$$$@ | append-metadata endef TARGET_DEVICES += tenda_be12-pro @@ -3125,7 +3122,7 @@ define Device/tplink_f65-v1 DEVICE_DTS := mt7981b-tplink-f65v1 DEVICE_DTS_DIR := ../dts KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware endef @@ -3144,7 +3141,7 @@ define Device/tplink_fr365-v1 KERNEL_IN_UBI := 1 IMAGES += factory.bin KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/factory.ubi := append-ubi | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := fitblk kmod-sfp kmod-usb3 kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware @@ -3163,9 +3160,9 @@ define Device/tplink_tl-xdr-common KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | append-metadata + fit gzip external-with-rootfs | append-metadata DEVICE_PACKAGES := fitblk kmod-usb3 kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7986-bl2 spim-nand-ddr3 @@ -3345,9 +3342,9 @@ define Device/wavlink_wl-wnt100x3-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ + fit gzip external-static-with-rootfs | \ append-metadata DEVICE_PACKAGES := kmod-usb3 kmod-mt7915e kmod-mt7981-firmware \ mt7981-wo-firmware kmod-hwmon-pwmfan @@ -3406,9 +3403,9 @@ define Device/xiaomi_mi-router-ax3000t-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot xiaomi_mi-router-ax3000t @@ -3455,9 +3452,9 @@ define Device/xiaomi_mi-router-wr30u-ubootmod KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot xiaomi_mi-router-wr30u @@ -3504,9 +3501,9 @@ define Device/xiaomi_redmi-router-ax6000-ubootmod UBOOTENV_IN_UBI := 1 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7986-bl2 spim-nand-ddr4 ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot xiaomi_redmi-router-ax6000 @@ -3529,7 +3526,7 @@ define Device/yuncore_ax835 IMAGE_SIZE := 14336k SUPPORTED_DEVICES += mediatek,mt7981-spim-nor-rfb KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs | check-size | append-metadata DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware endef @@ -3653,10 +3650,9 @@ define Device/zbtlink_zbt-z8803be DEVICE_PACKAGES := kmod-sfp kmod-hwmon-pwmfan kmod-usb3 kmod-mt7996-firmware mt7988-2p5g-phy-firmware mt7988-wo-firmware DEVICE_DTC_FLAGS := --pad 4096 SUPPORTED_DEVICES += zbtlink,zbt-z8803be,mt7988a-nand - KERNEL := kernel-bin | gzip | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | gzip | fit gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + fit lzma with-initrd | pad-to 64k IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef @@ -3704,7 +3700,7 @@ define Device/zyxel_ex5601-t0-ubootmod UBOOTENV_IN_UBI := 1 KERNEL := kernel-bin | lzma IMAGE/sysupgrade.itb := append-kernel | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit lzma external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7986-bl2 spim-nand-4k-ddr4 ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot zyxel_ex5601-t0 @@ -3766,7 +3762,7 @@ define Device/zyxel_wx5600-t0-ubootmod UBOOTENV_IN_UBI := 1 KERNEL := kernel-bin | lzma IMAGE/sysupgrade.itb := append-kernel | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit lzma external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7986-bl2 spim-nand-4k-ddr3 ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot zyxel_wx5600-t0 diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index a16c4e856be7..c63e1fcf64bd 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -116,8 +116,8 @@ ifeq ($(DUMP),) IMAGE_SIZE := $$(shell expr 45 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m endif KERNEL := kernel-bin | gzip - KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb with-initrd | pad-to 128k - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb external-static-with-rootfs | append-metadata + KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma with-initrd | pad-to 128k + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-static-with-rootfs | append-metadata DEVICE_COMPAT_VERSION := 1.2 DEVICE_COMPAT_MESSAGE := SPI-NAND flash layout changes require bootloader update endef @@ -135,7 +135,7 @@ define Device/buffalo_wsr BUFFALO_TAG_MINOR := 9.99 IMAGES += factory.bin factory-uboot.bin KERNEL_INITRAMFS = kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | \ + fit lzma with-initrd | \ buffalo-trx IMAGE/factory.bin = append-ubi | \ buffalo-trx $$$$(BUFFALO_TRX_MAGIC) $$$$@ $(KDIR)/ubi_mark | \ @@ -287,10 +287,10 @@ define Device/linksys_e8450-ubi KERNEL := kernel-bin | gzip # recovery can also be used with stock firmware web-ui, hence the padding... KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 128k + fit lzma with-initrd | pad-to 128k KERNEL_INITRAMFS_SUFFIX := -recovery.itb IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := bl2 snand-ubi-1ddr ARTIFACT/bl31-uboot.fip := bl31-uboot linksys_e8450 @@ -346,11 +346,11 @@ define Device/netgear_wax206 PAGESIZE := 2048 KERNEL_SIZE := 6144k IMAGE_SIZE := 32768k - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + KERNEL := kernel-bin | lzma | fit lzma | \ append-squashfs4-fakeroot # recovery can also be used with stock firmware web-ui, hence the padding... KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 128k + fit lzma with-initrd | pad-to 128k KERNEL_INITRAMFS_SUFFIX := -recovery.itb IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(KERNEL_SIZE) | \ @@ -408,9 +408,9 @@ define Device/ubnt_unifi-6-lr-v1-ubootmod DEVICE_PACKAGES := kmod-mt7915-firmware kmod-leds-ubnt-ledbar KERNEL := kernel-bin | lzma KERNEL_INITRAMFS_SUFFIX := -recovery.itb - KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma with-initrd | pad-to 64k IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit lzma external-static-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := bl2 nor-2ddr ARTIFACT/bl31-uboot.fip := bl31-uboot ubnt_unifi-6-lr-v1 @@ -438,9 +438,9 @@ define Device/ubnt_unifi-6-lr-v2-ubootmod DEVICE_PACKAGES := kmod-mt7915-firmware KERNEL := kernel-bin | lzma KERNEL_INITRAMFS_SUFFIX := -recovery.itb - KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma with-initrd | pad-to 64k IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit lzma external-static-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := bl2 nor-2ddr ARTIFACT/bl31-uboot.fip := bl31-uboot ubnt_unifi-6-lr-v2 @@ -467,9 +467,9 @@ define Device/ubnt_unifi-6-lr-v3-ubootmod DEVICE_PACKAGES := kmod-mt7915-firmware KERNEL := kernel-bin | lzma KERNEL_INITRAMFS_SUFFIX := -recovery.itb - KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma with-initrd | pad-to 64k IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit lzma external-static-with-rootfs | pad-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := bl2 nor-2ddr ARTIFACT/bl31-uboot.fip := bl31-uboot ubnt_unifi-6-lr-v3 @@ -489,10 +489,10 @@ define Device/xiaomi_redmi-router-ax6s BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL := kernel-bin | gzip - KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma with-initrd | pad-to 64k KERNEL_INITRAMFS_SUFFIX := -recovery.itb IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-static-with-rootfs | append-metadata ARTIFACTS := ubi-loader.itb ARTIFACT/ubi-loader.itb := uboot-bin xiaomi_redmi-router-ax6s-ubi-loader | lzma | uboot-fit lzma ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),) diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk index 93625c405b96..53898ea623d6 100644 --- a/target/linux/mediatek/image/mt7623.mk +++ b/target/linux/mediatek/image/mt7623.mk @@ -99,11 +99,11 @@ define Device/bananapi_bpi-r2 IMAGES := sysupgrade.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS_SUFFIX := -recovery.itb - KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb with-initrd + KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip with-initrd ifeq ($(DUMP),) IMAGE_SIZE := $$(shell expr 48 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m endif - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb external-static-with-rootfs | append-metadata + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-static-with-rootfs | append-metadata ARTIFACT/preloader.bin := mt7623-mbr emmc |\ pad-to 2k | append-preloader $$(UBOOT_TARGET) ARTIFACT/u-boot.bin := append-uboot @@ -144,8 +144,8 @@ endif IMAGES := sysupgrade.itb KERNEL := kernel-bin | gzip KERNEL_INITRAMFS_SUFFIX := -recovery.itb - KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip with-initrd + IMAGE/sysupgrade.itb := append-kernel | fit gzip external-static-with-rootfs | append-metadata ARTIFACT/u-boot.bin := append-uboot # vendor Preloader seems not to care about SDMMC_BOOT/EMMC_BOOT header, # but OpenWrt expects 'SDMM' magic for sysupgrade. diff --git a/target/linux/microchipsw/image/Makefile b/target/linux/microchipsw/image/Makefile index 2922c366c045..2e0ba63202f1 100644 --- a/target/linux/microchipsw/image/Makefile +++ b/target/linux/microchipsw/image/Makefile @@ -14,7 +14,7 @@ endef define Device/FitImage KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | libdeflate-gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | libdeflate-gzip | fit gzip KERNEL_NAME := Image endef diff --git a/target/linux/mpc85xx/image/p1010.mk b/target/linux/mpc85xx/image/p1010.mk index 9a4c0d84e425..d2bb681f58c4 100644 --- a/target/linux/mpc85xx/image/p1010.mk +++ b/target/linux/mpc85xx/image/p1010.mk @@ -82,7 +82,7 @@ define Device/watchguard_firebox-t10 DEVICE_PACKAGES := kmod-rtc-s35390a kmod-eeprom-at24 # This boot loader doesn't reliably boot an uncompressed image, # therefore resort to gzipping the already compressed zImage - KERNEL = kernel-bin | libdeflate-gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | libdeflate-gzip | fit gzip KERNEL_NAME := zImage.la3000000 KERNEL_ENTRY := 0x3000000 KERNEL_LOADADDR := 0x3000000 @@ -99,7 +99,7 @@ define Device/watchguard_firebox-t15 DEVICE_PACKAGES := kmod-rtc-s35390a kmod-eeprom-at24 # This boot loader doesn't reliably boot an uncompressed image, # therefore resort to gzipping the already compressed zImage - KERNEL = kernel-bin | libdeflate-gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | libdeflate-gzip | fit gzip KERNEL_NAME := zImage.la3000000 KERNEL_ENTRY := 0x3000000 KERNEL_LOADADDR := 0x3000000 @@ -114,7 +114,7 @@ define Device/sophos_red-15w-rev1 DEVICE_VARIANT := Rev.1 # Original firmware uses a dedicated DTB-partition. # The bootloader however supports FIT-images. - KERNEL = kernel-bin | libdeflate-gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | libdeflate-gzip | fit gzip IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef diff --git a/target/linux/mpc85xx/image/p1020.mk b/target/linux/mpc85xx/image/p1020.mk index ba41e17b9adb..6a2b09183de6 100644 --- a/target/linux/mpc85xx/image/p1020.mk +++ b/target/linux/mpc85xx/image/p1020.mk @@ -85,7 +85,7 @@ define Device/extreme-networks_ws-ap3825i KERNEL_NAME := simpleImage.ws-ap3825i KERNEL_ENTRY := 0x3000000 KERNEL_LOADADDR := 0x3000000 - KERNEL = kernel-bin | fit none $(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | fit none IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata endef @@ -98,7 +98,7 @@ define Device/hpe_msm460 DEVICE_ALT0_MODEL := MSM430 DEVICE_ALT1_VENDOR := Hewlett-Packard DEVICE_ALT1_MODEL := MSM466 - KERNEL = kernel-bin | fit none $(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | fit none KERNEL_NAME := zImage.la3000000 KERNEL_ENTRY := 0x3000000 KERNEL_LOADADDR := 0x3000000 @@ -117,7 +117,7 @@ define Device/ocedo_panda DEVICE_VENDOR := OCEDO DEVICE_MODEL := Panda DEVICE_PACKAGES := kmod-rtc-ds1307 - KERNEL = kernel-bin | libdeflate-gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | libdeflate-gzip | fit gzip PAGESIZE := 2048 SUBPAGESIZE := 512 BLOCKSIZE := 128k diff --git a/target/linux/mpc85xx/image/p2020.mk b/target/linux/mpc85xx/image/p2020.mk index dcff605047e3..b1ad159737db 100644 --- a/target/linux/mpc85xx/image/p2020.mk +++ b/target/linux/mpc85xx/image/p2020.mk @@ -7,8 +7,7 @@ define Device/freescale_p2020rdb DEVICE_PACKAGES := kmod-dsa-vsc73xx-platform kmod-gpio-pca953x \ kmod-hwmon-lm90 kmod-rtc-ds1307 BLOCKSIZE := 128k - KERNEL := kernel-bin | libdeflate-gzip | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | libdeflate-gzip | fit gzip SUPPORTED_DEVICES := fsl,P2020RDB IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ @@ -23,7 +22,7 @@ define Device/watchguard_xtm330 DEVICE_PACKAGES := kmod-dsa-mv88e6xxx kmod-hwmon-w83793 \ kmod-rtc-rs5c372a BLOCKSIZE := 128k - KERNEL = kernel-bin | fit none $(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | fit none KERNEL_NAME := zImage.la3000000 KERNEL_ENTRY := 0x3000000 KERNEL_LOADADDR := 0x3000000 diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 8f1dd4b5c7c1..89bfa515259b 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -138,7 +138,7 @@ endef define Device/FitImage KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | libdeflate-gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | libdeflate-gzip | fit gzip KERNEL_NAME := Image endef diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk index b564e5dc4a4c..265752d53853 100644 --- a/target/linux/mvebu/image/cortexa9.mk +++ b/target/linux/mvebu/image/cortexa9.mk @@ -102,7 +102,7 @@ define Device/cznic_turris-omnia KERNEL_INSTALL := 1 SOC := armada-385 KERNEL := kernel-bin - KERNEL_INITRAMFS := kernel-bin | libdeflate-gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL_INITRAMFS := kernel-bin | libdeflate-gzip | fit gzip DEVICE_PACKAGES := \ mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ wpad-basic-mbedtls kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \ diff --git a/target/linux/pistachio/image/Makefile b/target/linux/pistachio/image/Makefile index 64898b46e041..2471fe9cdd3c 100644 --- a/target/linux/pistachio/image/Makefile +++ b/target/linux/pistachio/image/Makefile @@ -11,7 +11,7 @@ define Device/Default PROFILES := Default FILESYSTEMS := squashfs KERNEL_DEPENDS = $$(wildcard $$(DTS_DIR)/$$(DEVICE_DTS).dts) - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip KERNEL_SUFFIX := -kernel.itb KERNEL_INSTALL := 1 KERNEL_IN_UBI := 1 diff --git a/target/linux/qoriq/image/generic.mk b/target/linux/qoriq/image/generic.mk index d084faf70cc2..bc04d05f6a72 100644 --- a/target/linux/qoriq/image/generic.mk +++ b/target/linux/qoriq/image/generic.mk @@ -6,7 +6,7 @@ define Device/fsl_T4240RDB kmod-eeprom-at24 kmod-gpio-button-hotplug kmod-hwmon-w83793 kmod-leds-gpio \ kmod-ptp-qoriq kmod-rtc-ds1374 FILESYSTEMS := squashfs - KERNEL := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | gzip | fit gzip IMAGES := factory-nor.bin.gz sdcard.img.gz rcw.bin sysupgrade.bin IMAGE/factory-nor.bin.gz := \ append-kernel | append-rootfs | pad-rootfs | pad-to 126M | \ @@ -38,7 +38,7 @@ define Device/watchguard_firebox-m300 DEVICE_PACKAGES := \ kmod-gpio-button-hotplug kmod-hwmon-w83793 kmod-leds-gpio kmod-ptp-qoriq \ kmod-rtc-rs5c372a kmod-tpm-i2c-atmel kmod-dsa-mv88e6xxx - KERNEL := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | gzip | fit gzip KERNEL_SUFFIX := -fit-uImage.itb IMAGES := sdcard.img.gz sysupgrade.img.gz IMAGE/sysupgrade.img.gz := sdcard-img | gzip | append-metadata diff --git a/target/linux/qualcommax/image/Makefile b/target/linux/qualcommax/image/Makefile index 245dc76fdc63..b6a35a4fba1d 100644 --- a/target/linux/qualcommax/image/Makefile +++ b/target/linux/qualcommax/image/Makefile @@ -14,13 +14,13 @@ endef define Device/FitImage KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | libdeflate-gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | libdeflate-gzip | fit gzip KERNEL_NAME := Image endef define Device/FitImageLzma KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma KERNEL_NAME := Image endef diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk index d1f42dd61784..2c7b061d6441 100644 --- a/target/linux/qualcommax/image/ipq807x.mk +++ b/target/linux/qualcommax/image/ipq807x.mk @@ -98,7 +98,7 @@ ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ARTIFACTS := initramfs-factory.trx initramfs-uImage.itb ARTIFACT/initramfs-uImage.itb := \ - append-image-stage initramfs-kernel.bin | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + append-image-stage initramfs-kernel.bin | fit gzip ARTIFACT/initramfs-factory.trx := \ append-image-stage initramfs-kernel.bin |\ asus-fake-rootfs xz /lib/firmware/IPQ8074A/fw_version.txt "fake" -no-compression |\ diff --git a/target/linux/qualcommbe/image/Makefile b/target/linux/qualcommbe/image/Makefile index 245dc76fdc63..b6a35a4fba1d 100644 --- a/target/linux/qualcommbe/image/Makefile +++ b/target/linux/qualcommbe/image/Makefile @@ -14,13 +14,13 @@ endef define Device/FitImage KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | libdeflate-gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | libdeflate-gzip | fit gzip KERNEL_NAME := Image endef define Device/FitImageLzma KERNEL_SUFFIX := -uImage.itb - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma KERNEL_NAME := Image endef diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index a80bede34784..e3fa157f6d42 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -278,7 +278,7 @@ define Device/alfa-network_ax1800rm DEVICE_VENDOR := ALFA Network DEVICE_MODEL := AX1800RM DEVICE_PACKAGES := kmod-mt7915-firmware - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | lzma | fit lzma IMAGES += recovery.bin IMAGE/recovery.bin := append-kernel | append-rootfs | pad-rootfs | check-size endef @@ -602,7 +602,7 @@ define Device/belkin_rt1800 DEVICE_PACKAGES := kmod-mt7915-firmware kmod-usb3 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + fit lzma | \ append-squashfs4-fakeroot IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ @@ -877,7 +877,7 @@ define Device/dlink_covr-x1860-a1 UBINIZE_OPTS := -E 5 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + fit lzma | \ append-squashfs4-fakeroot IMAGES += factory.bin recovery.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata @@ -916,7 +916,7 @@ define Device/dlink_dap-x1860-a1 KERNEL_SIZE := 8192k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size | elx-header 011b0060 8844A2D168B45A2D @@ -1145,7 +1145,7 @@ define Device/dlink_dir-x1860-b1 DEVICE_PACKAGES := kmod-mt7915-firmware KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + fit lzma | \ append-squashfs4-fakeroot IMAGES += factory.bin recovery.bin IMAGE/recovery.bin := append-kernel | pad-to $$(KERNEL_SIZE) | \ @@ -1267,7 +1267,7 @@ define Device/edup_ep-rt2983 DEVICE_MODEL := EP-RT2983 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | \ append-ubi | check-size @@ -1317,7 +1317,7 @@ define Device/elecom_wmc-x1800gst KERNEL_SIZE := 15360k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ARTIFACTS := initramfs-factory.bin @@ -1448,10 +1448,10 @@ define Device/elecom_wrc-x1800gs DEVICE_MODEL := WRC-X1800GS KERNEL_LOADADDR := 0x88000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + fit lzma | \ znet-header 4.04(XVF.1)b90 COMC 0x68 | elecom-product-header WRC-X1800GS KERNEL_INITRAMFS := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma KERNEL_SIZE := 8192k IMAGE_SIZE := 51456k ifeq ($(IB),) @@ -1473,7 +1473,7 @@ define Device/elecom_wsc-x1800gs KERNEL_SIZE := 15360k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ARTIFACTS := initramfs-factory.bin @@ -1622,7 +1622,7 @@ define Device/h3c_tx180x IMAGE_SIZE := 120832k KERNEL_LOADADDR := 0x82000000 KERNEL_INITRAMFS := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma KERNEL := $$(KERNEL_INITRAMFS) | h3c-blank-header DEVICE_VENDOR := H3C DEVICE_PACKAGES := kmod-mt7915-firmware @@ -1651,7 +1651,7 @@ define Device/haier-sim_wr1800k IMAGE_SIZE := 125440k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ARTIFACTS := initramfs-factory.bin @@ -1790,7 +1790,7 @@ define Device/iodata_wn-deax1800gr UBINIZE_OPTS := -E 5 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata ifeq ($(IB),) ARTIFACTS := initramfs-factory.bin @@ -1924,7 +1924,7 @@ define Device/iptime_ax2002m IMAGE_SIZE := 121344k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma ifeq ($(IB),) ARTIFACTS := initramfs-factory.bin ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \ @@ -1945,7 +1945,7 @@ define Device/iptime_ax2004m IMAGE_SIZE := 121344k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma ifeq ($(IB),) ARTIFACTS := initramfs-factory.bin ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \ @@ -2193,7 +2193,7 @@ define Device/maginon_mc-1200ac DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7663-firmware-ap kmod-usb3 -uboot-envtools KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | check-size | append-metadata IMAGE_SIZE := 15552k @@ -2371,7 +2371,7 @@ define Device/netgear_eax12 IMAGE_SIZE := 57344k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + fit lzma | \ append-squashfs4-fakeroot IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(KERNEL_SIZE) | \ @@ -2558,7 +2558,7 @@ define Device/netgear_wax202 IMAGE_SIZE := 38912k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + fit lzma | \ append-squashfs4-fakeroot IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(KERNEL_SIZE) | \ @@ -2576,7 +2576,7 @@ define Device/netgear_wax214v2 IMAGE_SIZE := 38912k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel 0x80001000 | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ + fit lzma | \ append-squashfs4-fakeroot IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(KERNEL_SIZE) | \ @@ -2610,7 +2610,7 @@ define Device/netis_n6 DEVICE_MODEL := N6 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | \ append-ubi | check-size | append-netis-n6-metadata @@ -2688,7 +2688,7 @@ define Device/plasmacloud_pax1800-lite DEVICE_PACKAGES := kmod-mt7915-firmware kmod-usb3 kmod-hwmon-lm75 KERNEL_IN_UBI := 1 IMAGES += factory.bin - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | pad-to $$(BLOCKSIZE) + KERNEL := kernel-bin | lzma | fit lzma | pad-to $$(BLOCKSIZE) IMAGE/factory.bin := append-rootfs | pad-to 1k | dualboot-datachk-nand-image ce_type=PAX1800-Lite IMAGE/sysupgrade.bin := append-rootfs | pad-to 1k | sysupgrade-tar rootfs=$$$$@ | append-metadata endef @@ -2877,7 +2877,7 @@ define Device/tenbay_t-mb5eu-v01 DEVICE_MODEL := T-MB5EU-V01 DEVICE_DTS_CONFIG := config@1 DEVICE_PACKAGES += kmod-mt7915-firmware kmod-usb3 -uboot-envtools - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | lzma | fit lzma IMAGE_SIZE := 15808k SUPPORTED_DEVICES += mt7621-dm2-t-mb5eu-v01-nor endef @@ -3061,8 +3061,8 @@ define Device/tplink_eap613-v1 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-mt7915-firmware -uboot-envtools TPLINK_BOARD_ID := EAP610-V3 - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | pad-to 64k - KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | lzma | fit lzma | pad-to 64k + KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma IMAGE_SIZE := 13248k endef TARGET_DEVICES += tplink_eap613-v1 @@ -3076,7 +3076,7 @@ define Device/tplink_eap615-wall-v1 TPLINK_BOARD_ID := EAP615-WALL-V1 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | pad-to 64k + fit lzma | pad-to 64k IMAGE_SIZE := 13248k endef TARGET_DEVICES += tplink_eap615-wall-v1 @@ -3117,7 +3117,7 @@ define Device/tplink_er605-v2 KERNEL_IN_UBI := 1 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma IMAGE_SIZE := 127744k endef TARGET_DEVICES += tplink_er605-v2 @@ -3131,7 +3131,7 @@ define Device/tplink_ex220-v1 TPLINK_BOARD_ID := EX220-V1 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma IMAGE_SIZE := 15744k endef TARGET_DEVICES += tplink_ex220-v1 @@ -3145,7 +3145,7 @@ define Device/tplink_ex220-v2 TPLINK_BOARD_ID := EX220-V2 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma IMAGE_SIZE := 15744k endef TARGET_DEVICES += tplink_ex220-v2 @@ -3267,7 +3267,7 @@ define Device/ubnt_unifi-6-lite DEVICE_DTS_CONFIG := config@1 DEVICE_DTS_LOADADDR := 0x87000000 DEVICE_PACKAGES += kmod-mt7603 kmod-mt7915-firmware -uboot-envtools - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | lzma | fit lzma IMAGE_SIZE := 30848k endef TARGET_DEVICES += ubnt_unifi-6-lite @@ -3278,7 +3278,7 @@ define Device/ubnt_unifi-flexhd DEVICE_MODEL := UniFi FlexHD DEVICE_DTS_CONFIG := config@2 DEVICE_DTS_LOADADDR := 0x87000000 - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | lzma | fit lzma DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615-firmware kmod-leds-ubnt-ledbar \ -uboot-envtools IMAGE_SIZE := 15552k @@ -3301,7 +3301,7 @@ define Device/ubnt_usw-flex DEVICE_DTS_CONFIG := config@1 DEVICE_DTS_LOADADDR := 0x87000000 DEVICE_PACKAGES += -uboot-envtools - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | lzma | fit lzma IMAGE_SIZE := 14720k endef TARGET_DEVICES += ubnt_usw-flex @@ -3393,7 +3393,7 @@ define Device/wavlink_ws-wn572hp3-4g IMAGE_SIZE := 15040k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | check-size | append-metadata DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7663-firmware-ap \ @@ -3705,7 +3705,7 @@ define Device/z-router_zr-2660 IMAGE_SIZE := 90112k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma DEVICE_PACKAGES += kmod-mt7915-firmware kmod-usb3 -uboot-envtools endef TARGET_DEVICES += z-router_zr-2660 @@ -3718,7 +3718,7 @@ define Device/z-router_zr-2662 IMAGE_SIZE := 121344k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + fit lzma DEVICE_PACKAGES += kmod-mt7915-firmware kmod-usb3 -uboot-envtools endef TARGET_DEVICES += z-router_zr-2662 @@ -3929,7 +3929,7 @@ define Device/zyxel_nwa-ax DEVICE_VENDOR := Zyxel KERNEL_SIZE := 8192k DEVICE_PACKAGES := kmod-mt7915-firmware zyxel-bootconfig - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL := kernel-bin | lzma | fit lzma IMAGES += factory.bin ramboot-factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | zyxel-nwa-fit IMAGE/ramboot-factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi @@ -3967,7 +3967,7 @@ define Device/zyxel_wsm20 DEVICE_VENDOR := Zyxel DEVICE_MODEL := WSM20 DEVICE_PACKAGES := kmod-mt7915-firmware - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | znet-header V1.00(ABZF.0)C0 - KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | znet-header V1.00(ABZF.0)C0 + KERNEL := kernel-bin | lzma | fit lzma | znet-header V1.00(ABZF.0)C0 + KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma | znet-header V1.00(ABZF.0)C0 endef TARGET_DEVICES += zyxel_wsm20 diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile index d46d19290097..236d984551ed 100644 --- a/target/linux/rockchip/image/Makefile +++ b/target/linux/rockchip/image/Makefile @@ -46,7 +46,7 @@ endef ### Devices ### define Device/Default PROFILES := Default - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL = kernel-bin | lzma | fit lzma KERNEL_LOADADDR := BOOT_SCRIPT := IMAGES := sysupgrade.img.gz diff --git a/target/linux/siflower/image/sf21.mk b/target/linux/siflower/image/sf21.mk index d06fd0a9eada..293b47af16c8 100644 --- a/target/linux/siflower/image/sf21.mk +++ b/target/linux/siflower/image/sf21.mk @@ -4,19 +4,19 @@ define Device/Default BLOCKSIZE := 64k KERNEL = kernel-bin | lzma KERNEL_INITRAMFS = kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 128k + fit lzma with-initrd | pad-to 128k KERNEL_LOADADDR := 0x20000000 FILESYSTEMS := squashfs DEVICE_DTS_DIR := ../dts IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin = append-kernel | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | pad-rootfs | append-metadata + IMAGE/sysupgrade.bin = append-kernel | fit lzma external-static-with-rootfs | pad-rootfs | append-metadata endef define Device/NAND KERNEL := kernel-bin | gzip KERNEL_INITRAMFS = kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 128k - IMAGE/sysupgrade.bin = append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata + fit lzma with-initrd | pad-to 128k + IMAGE/sysupgrade.bin = append-kernel | fit gzip external-static-with-rootfs | append-metadata endef define Device/bananapi_bpi-rv2 diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index 8c14aec3bebb..74e9847f30ca 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -36,11 +36,11 @@ define Device/Default endef define Device/FitImageLzma - KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma endef define Device/FitImageGzip - KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip endef include $(SUBTARGET).mk diff --git a/target/linux/zynq/image/Makefile b/target/linux/zynq/image/Makefile index 4a9c2f047ddd..22e1d4e4eaff 100644 --- a/target/linux/zynq/image/Makefile +++ b/target/linux/zynq/image/Makefile @@ -39,7 +39,7 @@ endef define Device/FitImageGzip KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip KERNEL_NAME := Image endef -- 2.54.0 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
