Skip to content

Commit 51de644

Browse files
nehebrobimarko
authored andcommitted
mvebu: use libdeflate for gzip
Small size reduction. Tested with Turris Omnia. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: openwrt/openwrt#23054 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent d9f2898 commit 51de644

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

target/linux/mvebu/image/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ define Device/Default-arm64
173173
BOOT_SCRIPT := generic-arm64
174174
DEVICE_DTS_DIR := $(DTS_DIR)/marvell
175175
IMAGES := sdcard.img.gz
176-
IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
176+
IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
177177
KERNEL_NAME := Image
178178
KERNEL := kernel-bin
179179
endef

target/linux/mvebu/image/cortexa72.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ define Device/checkpoint_v-80
1919
IMAGE/sysupgrade.gz := boot-scr eMMC | append-bootscript | pad-to 2048 | \
2020
append-kernel | \
2121
sysupgrade-tar kernel=$$$$@ dtb=$$(KDIR)/image-$$(DEVICE_DTS).dtb | \
22-
gzip | append-metadata
22+
libdeflate-gzip | append-metadata
2323
ARTIFACTS := initramfs.dtb initramfs.scr
2424
ARTIFACT/initramfs.dtb := append-dtb
2525
ARTIFACT/initramfs.scr := boot-scr INIT | append-bootscript
@@ -37,7 +37,7 @@ define Device/checkpoint_v-81
3737
IMAGE/sysupgrade.gz := boot-scr eMMC | append-bootscript | pad-to 2048 | \
3838
append-kernel | \
3939
sysupgrade-tar kernel=$$$$@ dtb=$$(KDIR)/image-$$(DEVICE_DTS).dtb | \
40-
gzip | append-metadata
40+
libdeflate-gzip | append-metadata
4141
ARTIFACTS := initramfs.dtb initramfs.scr
4242
ARTIFACT/initramfs.dtb := append-dtb
4343
ARTIFACT/initramfs.scr := boot-scr INIT | append-bootscript
@@ -59,7 +59,7 @@ define Device/marvell_armada7040-db
5959
DEVICE_VENDOR := Marvell
6060
DEVICE_MODEL := Armada 7040 Development Board
6161
DEVICE_DTS := armada-7040-db
62-
IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
62+
IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
6363
endef
6464
TARGET_DEVICES += marvell_armada7040-db
6565

@@ -68,7 +68,7 @@ define Device/marvell_armada8040-db
6868
DEVICE_VENDOR := Marvell
6969
DEVICE_MODEL := Armada 8040 Development Board
7070
DEVICE_DTS := armada-8040-db
71-
IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
71+
IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
7272
endef
7373
TARGET_DEVICES += marvell_armada8040-db
7474

target/linux/mvebu/image/cortexa9.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ define Device/cznic_turris-omnia
102102
KERNEL_INSTALL := 1
103103
SOC := armada-385
104104
KERNEL := kernel-bin
105-
KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
105+
KERNEL_INITRAMFS := kernel-bin | libdeflate-gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
106106
DEVICE_PACKAGES := \
107107
mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
108108
wpad-basic-mbedtls kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \
109109
kmod-mt7915-firmware partx-utils kmod-i2c-mux-pca954x kmod-leds-turris-omnia \
110110
kmod-turris-omnia-mcu kmod-gpio-button-hotplug omnia-eeprom omnia-mcu-firmware \
111111
omnia-mcutool kmod-dsa-mv88e6xxx
112112
IMAGES := sysupgrade.img.gz
113-
IMAGE/sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | gzip | append-metadata
113+
IMAGE/sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | libdeflate-gzip | append-metadata
114114
SUPPORTED_DEVICES += armada-385-turris-omnia
115115
BOOT_SCRIPT := turris-omnia
116116
endef
@@ -238,7 +238,7 @@ define Device/kobol_helios4
238238
KERNEL := kernel-bin
239239
DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils
240240
IMAGES := sdcard.img.gz
241-
IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
241+
IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
242242
SOC := armada-388
243243
UBOOT := helios4-u-boot-with-spl.kwb
244244
BOOT_SCRIPT := clearfog
@@ -418,7 +418,7 @@ define Device/solidrun_clearfog-base-a1
418418
KERNEL := kernel-bin
419419
DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils kmod-dsa-mv88e6xxx
420420
IMAGES := sdcard.img.gz
421-
IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
421+
IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
422422
DEVICE_DTS := armada-388-clearfog-base armada-388-clearfog-pro
423423
UBOOT := clearfog-u-boot-with-spl.kwb
424424
BOOT_SCRIPT := clearfog
@@ -436,7 +436,7 @@ define Device/solidrun_clearfog-pro-a1
436436
KERNEL := kernel-bin
437437
DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils kmod-dsa-mv88e6xxx
438438
IMAGES := sdcard.img.gz
439-
IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
439+
IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | libdeflate-gzip | append-metadata
440440
DEVICE_DTS := armada-388-clearfog-pro armada-388-clearfog-base
441441
UBOOT := clearfog-u-boot-with-spl.kwb
442442
BOOT_SCRIPT := clearfog
@@ -469,7 +469,7 @@ define Device/wd_cloud-ex2-ultra
469469
DEVICE_MODEL := MyCloud EX2 Ultra
470470
DEVICE_PACKAGES += -uboot-envtools mkf2fs e2fsprogs \
471471
partx-utils kmod-hwmon-drivetemp -ppp -kmod-nft-offload -dnsmasq \
472-
-odhcpd-ipv6only
472+
-odhcpd-ipv6only
473473
DEVICE_DTS := armada-385-wd_cloud-ex2-ultra
474474
KERNEL_SIZE := 5120k
475475
KERNEL := kernel-bin | append-dtb | uImage none
@@ -486,7 +486,7 @@ define Device/wd_cloud-mirror-gen2
486486
DEVICE_MODEL := MyCloud Mirror Gen 2 (BWVZ/Grand Teton)
487487
DEVICE_PACKAGES += -uboot-envtools mkf2fs e2fsprogs \
488488
partx-utils kmod-hwmon-drivetemp -ppp -kmod-nft-offload -dnsmasq \
489-
-odhcpd-ipv6only
489+
-odhcpd-ipv6only
490490
DEVICE_DTS := armada-385-wd_cloud-mirror-gen2
491491
KERNEL_SIZE := 5120k
492492
KERNEL := kernel-bin | append-dtb | uImage none

0 commit comments

Comments
 (0)