From 0d12a1c54c6fa9e8c9fcef4b37884ef734fa4505 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 8 Aug 2024 11:38:32 +0000 Subject: [PATCH] linux: use zstd instead of lz4 for initramfs and gzip instead of lz4 for 32 bit kernels --- projects/Allwinner/linux/linux.aarch64.conf | 4 ++-- projects/Allwinner/linux/linux.arm.conf | 4 ++-- projects/Allwinner/options | 2 +- projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf | 4 ++-- .../Rockchip/devices/RK3328/linux/default/linux.aarch64.conf | 4 ++-- .../Rockchip/devices/RK3399/linux/default/linux.aarch64.conf | 4 ++-- projects/Rockchip/options | 2 +- projects/Samsung/linux/linux.arm.conf | 4 ++-- projects/Samsung/options | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/projects/Allwinner/linux/linux.aarch64.conf b/projects/Allwinner/linux/linux.aarch64.conf index f87d855fc9..1f88d3c204 100644 --- a/projects/Allwinner/linux/linux.aarch64.conf +++ b/projects/Allwinner/linux/linux.aarch64.conf @@ -209,8 +209,8 @@ CONFIG_INITRAMFS_ROOT_GID=0 # CONFIG_RD_LZO is not set CONFIG_RD_LZ4=y CONFIG_RD_ZSTD=y -CONFIG_INITRAMFS_COMPRESSION_LZ4=y -# CONFIG_INITRAMFS_COMPRESSION_ZSTD is not set +# CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set +CONFIG_INITRAMFS_COMPRESSION_ZSTD=y # CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_BOOT_CONFIG is not set CONFIG_INITRAMFS_PRESERVE_MTIME=y diff --git a/projects/Allwinner/linux/linux.arm.conf b/projects/Allwinner/linux/linux.arm.conf index c5a4f247f0..4ab584194f 100644 --- a/projects/Allwinner/linux/linux.arm.conf +++ b/projects/Allwinner/linux/linux.arm.conf @@ -37,11 +37,11 @@ CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y -# CONFIG_KERNEL_GZIP is not set +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set -CONFIG_KERNEL_LZ4=y +# CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="@DISTRONAME@" CONFIG_SYSVIPC=y diff --git a/projects/Allwinner/options b/projects/Allwinner/options index 37578dfda3..08c76b81dc 100644 --- a/projects/Allwinner/options +++ b/projects/Allwinner/options @@ -9,7 +9,7 @@ KERNEL_MAKE_EXTRACMD="dtbs" # Additional kernel dependencies - KERNEL_EXTRA_DEPENDS_TARGET="lz4:host" + KERNEL_EXTRA_DEPENDS_TARGET="" # Kernel to use. values can be: # default: default mainline kernel diff --git a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf index 3363da7ed5..9129c7bbf5 100644 --- a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf +++ b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf @@ -37,11 +37,11 @@ CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y -# CONFIG_KERNEL_GZIP is not set +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set -CONFIG_KERNEL_LZ4=y +# CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="@DISTRONAME@" CONFIG_SYSVIPC=y diff --git a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf index 092208fdd7..9f851b9810 100644 --- a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf @@ -204,8 +204,8 @@ CONFIG_INITRAMFS_ROOT_GID=0 # CONFIG_RD_LZO is not set CONFIG_RD_LZ4=y CONFIG_RD_ZSTD=y -CONFIG_INITRAMFS_COMPRESSION_LZ4=y -# CONFIG_INITRAMFS_COMPRESSION_ZSTD is not set +# CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set +CONFIG_INITRAMFS_COMPRESSION_ZSTD=y # CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_BOOT_CONFIG is not set CONFIG_INITRAMFS_PRESERVE_MTIME=y diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index 28ad151dde..ab293e229e 100644 --- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf @@ -204,8 +204,8 @@ CONFIG_INITRAMFS_ROOT_GID=0 # CONFIG_RD_LZO is not set CONFIG_RD_LZ4=y CONFIG_RD_ZSTD=y -CONFIG_INITRAMFS_COMPRESSION_LZ4=y -# CONFIG_INITRAMFS_COMPRESSION_ZSTD is not set +# CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set +CONFIG_INITRAMFS_COMPRESSION_ZSTD=y # CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_BOOT_CONFIG is not set CONFIG_INITRAMFS_PRESERVE_MTIME=y diff --git a/projects/Rockchip/options b/projects/Rockchip/options index 98b2318bca..c18daa3e27 100644 --- a/projects/Rockchip/options +++ b/projects/Rockchip/options @@ -13,7 +13,7 @@ KERNEL_MAKE_EXTRACMD="dtbs" # Additional kernel dependencies - KERNEL_EXTRA_DEPENDS_TARGET="lz4:host" + KERNEL_EXTRA_DEPENDS_TARGET="" # Kernel to use. values can be: # default: default mainline kernel diff --git a/projects/Samsung/linux/linux.arm.conf b/projects/Samsung/linux/linux.arm.conf index 6048487894..972f17b659 100644 --- a/projects/Samsung/linux/linux.arm.conf +++ b/projects/Samsung/linux/linux.arm.conf @@ -37,11 +37,11 @@ CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y -# CONFIG_KERNEL_GZIP is not set +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set -CONFIG_KERNEL_LZ4=y +# CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="@DISTRONAME@" CONFIG_SYSVIPC=y diff --git a/projects/Samsung/options b/projects/Samsung/options index f009e0901a..5928b2d023 100644 --- a/projects/Samsung/options +++ b/projects/Samsung/options @@ -12,7 +12,7 @@ KERNEL_TARGET="zImage" # Additional kernel dependencies - KERNEL_EXTRA_DEPENDS_TARGET="lz4:host" + KERNEL_EXTRA_DEPENDS_TARGET="" # Additional kernel make parameters (for example to specify the u-boot loadaddress) KERNEL_MAKE_EXTRACMD="dtbs"