diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/config/Config.in.tools | |
parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) |
resolve merge conflict
Diffstat (limited to 'target/config/Config.in.tools')
-rw-r--r-- | target/config/Config.in.tools | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 3cb9c1537..88b72607e 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -161,3 +161,13 @@ config ADK_HOST_BUILD_PCRE default n source "target/config/Config.in.prereq" + +config ADK_COMPRESSION_TOOL + string + default "gzip -n9" if ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP + default "bzip2" if ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2 + default "xz --check=crc32" if ADK_KERNEL_INITRAMFS_COMPRESSION_XZ + default "lzma -9" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA + default "lzop" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZO + default "gzip -n9" + help |