diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2024-04-01 07:17:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2024-04-01 07:17:09 +0200 |
| commit | 61529d3eb35c738fe61b62f11443a955af597cb0 (patch) | |
| tree | 38623a0a3f5bb59233dd0a163df8454f4b0ea634 /target | |
| parent | f89d075247f067799af765e8373c5b39a1fad49a (diff) | |
avoid xz where possible
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.tools | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.compression | 21 |
2 files changed, 1 insertions, 26 deletions
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 9433bfa89..cdeeb90ed 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -137,10 +137,6 @@ config ADK_HOST_BUILD_TAR bool default n -config ADK_HOST_BUILD_XZ - bool - default n - # optional, but can be provided by host config ADK_HOST_BUILD_DOSFSTOOLS bool @@ -290,7 +286,6 @@ config ADK_HOST_NEED_SQUASHFS config ADK_HOST_BUILD_SQUASHFS bool - select ADK_HOST_BUILD_XZ default y if ADK_HOST_NEED_SQUASHFS default n @@ -322,7 +317,6 @@ config ADK_COMPRESSION_TOOL string default "gzip -n9" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_GZIP default "bzip2" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_BZIP2 - default "xz -v --check=crc32 --lzma2=dict=1MiB" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_XZ default "zstd" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_ZSTD default "lz4c -l" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZ4 default "lzma -9" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZMA diff --git a/target/linux/config/Config.in.compression b/target/linux/config/Config.in.compression index 2e3d16b6c..c2461ba80 100644 --- a/target/linux/config/Config.in.compression +++ b/target/linux/config/Config.in.compression @@ -4,10 +4,6 @@ config ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_NONE bool -config ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_XZ - bool - select ADK_HOST_NEED_XZ - config ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_ZSTD bool select ADK_HOST_NEED_ZSTD @@ -67,12 +63,6 @@ config ADK_LINUX_KERNEL_RD_ZSTD config ADK_LINUX_KERNEL_KERNEL_ZSTD bool -config ADK_LINUX_KERNEL_RD_XZ - bool - -config ADK_LINUX_KERNEL_KERNEL_XZ - bool - config ADK_LINUX_KERNEL_KERNEL_COMPRESS_NONE bool @@ -83,9 +73,8 @@ config ADK_LINUX_KERNEL_INITRAMFS_SOURCE choice prompt "Kernel compression" depends on ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH -default ADK_LINUX_KERNEL_COMP_GZIP if ADK_TARGET_BOARD_BCM28XX default ADK_LINUX_KERNEL_COMP_ZSTD if ADK_TARGET_ARCH_OR1K -default ADK_LINUX_KERNEL_COMP_XZ +default ADK_LINUX_KERNEL_COMP_GZIP config ADK_LINUX_KERNEL_COMP_ZSTD bool "use Zstandard compression" @@ -95,14 +84,6 @@ config ADK_LINUX_KERNEL_COMP_ZSTD depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \ || ADK_TARGET_GENERIC -config ADK_LINUX_KERNEL_COMP_XZ - bool "use XZ compression" - select ADK_LINUX_KERNEL_RD_XZ - select ADK_LINUX_KERNEL_KERNEL_XZ - select ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_XZ - depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \ - || ADK_TARGET_GENERIC - config ADK_LINUX_KERNEL_COMP_LZ4 bool "use LZ4 compression" select ADK_LINUX_KERNEL_RD_LZ4 |