domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apm821xx: Migrate to libdeflate

Browse Source 
libdeflate's gzip compressor provides a better
compression ratio and uboot's decompressor has
no problem with the data streams.

Tested on MX60, WNDR4700, WNDAP660

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Christian Lamparter
2023-01-02 11:04:11 +01:00
parent 8634c1080d
commit 4ca858f1a0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/apm821xx/image/nand.mk
View File

@@ -51,7 +51,7 @@ define Device/meraki_mx60
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
DTB_SIZE := 20480 DTB_SIZE := 20480
IMAGE_SIZE := 1021m IMAGE_SIZE := 1021m
KERNEL := kernel-bin | gzip | dtb | MuImage-initramfs gzip KERNEL := kernel-bin | libdeflate-gzip | dtb | MuImage-initramfs gzip
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
DEVICE_COMPAT_VERSION := 2.0 DEVICE_COMPAT_VERSION := 2.0
@@ -70,7 +70,7 @@ define Device/netgear_wndap6x0
IMAGE_SIZE := 27392k IMAGE_SIZE := 27392k
IMAGES := sysupgrade.bin factory.img IMAGES := sysupgrade.bin factory.img
KERNEL_SIZE := 6080k KERNEL_SIZE := 6080k
KERNEL := dtb | kernel-bin | gzip | MuImage-initramfs gzip KERNEL := dtb | kernel-bin | libdeflate-gzip | MuImage-initramfs gzip
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
@@ -114,7 +114,7 @@ define Device/netgear_wndr4700
# CHECK_DNI_FIRMWARE_ROOTFS_INTEGRITY in do_chk_dniimg() # CHECK_DNI_FIRMWARE_ROOTFS_INTEGRITY in do_chk_dniimg()
KERNEL := kernel-bin | lzma -d16 | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | \ KERNEL := kernel-bin | lzma -d16 | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | \
append-uImage-fakehdr filesystem | dtb | create-uImage-dtb | prepend-dtb append-uImage-fakehdr filesystem | dtb | create-uImage-dtb | prepend-dtb
KERNEL_INITRAMFS := kernel-bin | gzip | dtb | MuImage-initramfs gzip KERNEL_INITRAMFS := kernel-bin | libdeflate-gzip | dtb | MuImage-initramfs gzip
IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \
netgear-dni | check-size netgear-dni | check-size
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata

8
target/linux/apm821xx/image/sata.mk
View File

@@ -12,14 +12,14 @@ define Device/wd_mybooklive
SUPPORTED_DEVICES += mbl wd,mybooklive-duo SUPPORTED_DEVICES += mbl wd,mybooklive-duo
BLOCKSIZE := 1k BLOCKSIZE := 1k
DTB_SIZE := 16384 DTB_SIZE := 16384
KERNEL := kernel-bin | dtb | gzip | uImage gzip KERNEL := kernel-bin | dtb | libdeflate-gzip | uImage gzip
KERNEL_INITRAMFS := kernel-bin | gzip | dtb | MuImage-initramfs gzip KERNEL_INITRAMFS := kernel-bin | libdeflate-gzip | dtb | MuImage-initramfs gzip
IMAGES := factory.img.gz sysupgrade.img.gz IMAGES := factory.img.gz sysupgrade.img.gz
ARTIFACTS := apollo3g.dtb ARTIFACTS := apollo3g.dtb
DEVICE_DTB := apollo3g.dtb DEVICE_DTB := apollo3g.dtb
FILESYSTEMS := ext4 squashfs FILESYSTEMS := ext4 squashfs
IMAGE/factory.img.gz := boot-script | boot-img | hdd-img | gzip IMAGE/factory.img.gz := boot-script | boot-img | hdd-img | libdeflate-gzip
IMAGE/sysupgrade.img.gz := boot-script | boot-img | hdd-img | gzip | append-metadata IMAGE/sysupgrade.img.gz := boot-script | boot-img | hdd-img | libdeflate-gzip | append-metadata
ARTIFACT/apollo3g.dtb := export-dtb ARTIFACT/apollo3g.dtb := export-dtb
endef endef