mvebu: use libdeflate for gzip

Small size reduction.

Tested with Turris Omnia.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23054
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index 7b462c9a88a4f46fb500615ac11ca14600ca1d7d..46b18fc524f0ff1d115c61ce066049bd0867c5c0 100644 (file)
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -173,7 +173,7 @@ define Device/Default-arm64
   BOOT_SCRIPT := generic-arm64
   DEVICE_DTS_DIR := $(DTS_DIR)/marvell
   IMAGES := sdcard.img.gz
-  IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
+  IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
   KERNEL_NAME := Image
   KERNEL := kernel-bin
 endef

diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk
index 7d7fe49490a740575904fc4c813f42a223e4f15e..20cf50064c6f10d83a7a371ea456b81863b69996 100644 (file)
--- a/target/linux/mvebu/image/cortexa72.mk
+++ b/target/linux/mvebu/image/cortexa72.mk
@@ -19,7 +19,7 @@ define Device/checkpoint_v-80
   IMAGE/sysupgrade.gz := boot-scr eMMC | append-bootscript | pad-to 2048 | \
        append-kernel | \
        sysupgrade-tar kernel=$$$$@ dtb=$$(KDIR)/image-$$(DEVICE_DTS).dtb | \
-       gzip | append-metadata
+       libdeflate-gzip | append-metadata
   ARTIFACTS := initramfs.dtb initramfs.scr
   ARTIFACT/initramfs.dtb := append-dtb
   ARTIFACT/initramfs.scr := boot-scr INIT | append-bootscript
@@ -37,7 +37,7 @@ define Device/checkpoint_v-81
   IMAGE/sysupgrade.gz := boot-scr eMMC | append-bootscript | pad-to 2048 | \
        append-kernel | \
        sysupgrade-tar kernel=$$$$@ dtb=$$(KDIR)/image-$$(DEVICE_DTS).dtb | \
-       gzip | append-metadata
+       libdeflate-gzip | append-metadata
   ARTIFACTS := initramfs.dtb initramfs.scr
   ARTIFACT/initramfs.dtb := append-dtb
   ARTIFACT/initramfs.scr := boot-scr INIT | append-bootscript
@@ -59,7 +59,7 @@ define Device/marvell_armada7040-db
   DEVICE_VENDOR := Marvell
   DEVICE_MODEL := Armada 7040 Development Board
   DEVICE_DTS := armada-7040-db
-  IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
+  IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
 endef
 TARGET_DEVICES += marvell_armada7040-db
 
@@ -68,7 +68,7 @@ define Device/marvell_armada8040-db
   DEVICE_VENDOR := Marvell
   DEVICE_MODEL := Armada 8040 Development Board
   DEVICE_DTS := armada-8040-db
-  IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
+  IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
 endef
 TARGET_DEVICES += marvell_armada8040-db
 

diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk
index aaee1f6c836ce3a9ab9c70f0b11ac7f5981fb74f..b87b615e80d1fbb5e64ca75c880eed3c094eb3f5 100644 (file)
--- 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 | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
+  KERNEL_INITRAMFS := kernel-bin | libdeflate-gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
   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 \
@@ -110,7 +110,7 @@ define Device/cznic_turris-omnia
     kmod-turris-omnia-mcu kmod-gpio-button-hotplug omnia-eeprom omnia-mcu-firmware \
     omnia-mcutool kmod-dsa-mv88e6xxx
   IMAGES := sysupgrade.img.gz
-  IMAGE/sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | gzip | append-metadata
+  IMAGE/sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | libdeflate-gzip | append-metadata
   SUPPORTED_DEVICES += armada-385-turris-omnia
   BOOT_SCRIPT := turris-omnia
 endef
@@ -238,7 +238,7 @@ define Device/kobol_helios4
   KERNEL := kernel-bin
   DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils
   IMAGES := sdcard.img.gz
-  IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
+  IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
   SOC := armada-388
   UBOOT := helios4-u-boot-with-spl.kwb
   BOOT_SCRIPT := clearfog
@@ -418,7 +418,7 @@ define Device/solidrun_clearfog-base-a1
   KERNEL := kernel-bin
   DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils kmod-dsa-mv88e6xxx
   IMAGES := sdcard.img.gz
-  IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
+  IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
   DEVICE_DTS := armada-388-clearfog-base armada-388-clearfog-pro
   UBOOT := clearfog-u-boot-with-spl.kwb
   BOOT_SCRIPT := clearfog
@@ -436,7 +436,7 @@ define Device/solidrun_clearfog-pro-a1
   KERNEL := kernel-bin
   DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils kmod-dsa-mv88e6xxx
   IMAGES := sdcard.img.gz
-  IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
+  IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
   DEVICE_DTS := armada-388-clearfog-pro armada-388-clearfog-base
   UBOOT := clearfog-u-boot-with-spl.kwb
   BOOT_SCRIPT := clearfog
@@ -469,7 +469,7 @@ define Device/wd_cloud-ex2-ultra
   DEVICE_MODEL := MyCloud EX2 Ultra
   DEVICE_PACKAGES += -uboot-envtools mkf2fs e2fsprogs \
        partx-utils kmod-hwmon-drivetemp -ppp -kmod-nft-offload -dnsmasq \
-       -odhcpd-ipv6only 
+       -odhcpd-ipv6only
   DEVICE_DTS := armada-385-wd_cloud-ex2-ultra
   KERNEL_SIZE := 5120k
   KERNEL := kernel-bin | append-dtb | uImage none
@@ -486,7 +486,7 @@ define Device/wd_cloud-mirror-gen2
   DEVICE_MODEL := MyCloud Mirror Gen 2 (BWVZ/Grand Teton)
   DEVICE_PACKAGES += -uboot-envtools mkf2fs e2fsprogs \
        partx-utils kmod-hwmon-drivetemp -ppp -kmod-nft-offload -dnsmasq \
-       -odhcpd-ipv6only 
+       -odhcpd-ipv6only
   DEVICE_DTS := armada-385-wd_cloud-mirror-gen2
   KERNEL_SIZE := 5120k
   KERNEL := kernel-bin | append-dtb | uImage none