diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2013-05-13 16:43:50 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2013-05-13 16:43:50 +0300 |
| commit | 567636fb219937cec273ba15f92e635f5b84cd4e (patch) | |
| tree | 17f54c30eb98f5a9252398355a698826886ee7ee | |
| parent | 94d107ea0ce2772359ee7d09041abd920ec8b8bb (diff) | |
| download | xz-embedded-567636fb219937cec273ba15f92e635f5b84cd4e.tar.gz | |
Update linux/lib/xz/Kconfig from Linux 3.9.
This drops "if EXPERT" from BCJ filter configuration, and the
default configuration enables only the BCJ filter(s) that are
likely needed on the target arch: x86 BCJ filter is enabled
on x86, PowerPC filter on PowerPC, and so on.
Patches do this were made by Florian Fainelli, and a typo was
fixed by Paul Bolle.
| -rw-r--r-- | linux/lib/xz/Kconfig | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/linux/lib/xz/Kconfig b/linux/lib/xz/Kconfig index 60a6088..08837db 100644 --- a/linux/lib/xz/Kconfig +++ b/linux/lib/xz/Kconfig @@ -6,42 +6,40 @@ config XZ_DEC the .xz file format as the container. For integrity checking, CRC32 is supported. See Documentation/xz.txt for more information. +if XZ_DEC + config XZ_DEC_X86 - bool "x86 BCJ filter decoder" if EXPERT - default y - depends on XZ_DEC + bool "x86 BCJ filter decoder" + default y if X86 select XZ_DEC_BCJ config XZ_DEC_POWERPC - bool "PowerPC BCJ filter decoder" if EXPERT - default y - depends on XZ_DEC + bool "PowerPC BCJ filter decoder" + default y if PPC select XZ_DEC_BCJ config XZ_DEC_IA64 - bool "IA-64 BCJ filter decoder" if EXPERT - default y - depends on XZ_DEC + bool "IA-64 BCJ filter decoder" + default y if IA64 select XZ_DEC_BCJ config XZ_DEC_ARM - bool "ARM BCJ filter decoder" if EXPERT - default y - depends on XZ_DEC + bool "ARM BCJ filter decoder" + default y if ARM select XZ_DEC_BCJ config XZ_DEC_ARMTHUMB - bool "ARM-Thumb BCJ filter decoder" if EXPERT - default y - depends on XZ_DEC + bool "ARM-Thumb BCJ filter decoder" + default y if (ARM && ARM_THUMB) select XZ_DEC_BCJ config XZ_DEC_SPARC - bool "SPARC BCJ filter decoder" if EXPERT - default y - depends on XZ_DEC + bool "SPARC BCJ filter decoder" + default y if SPARC select XZ_DEC_BCJ +endif + config XZ_DEC_BCJ bool default n |