[PATCH 1/2] decompressors: group XZ_DEC_* symbols under an if XZ_BCJ / endif

[PATCH 1/2] decompressors: group XZ_DEC_* symbols under an if XZ_BCJ / endif

[Florian Fainelli]

This patch groups all architecture-specific BCJ filter configuration
symbols under an if XZ_BCJ / endif statement.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 lib/xz/Kconfig |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index 60a6088..12d2d777 100644
--- a/lib/xz/Kconfig
+++ b/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
 	select XZ_DEC_BCJ
 
 config XZ_DEC_POWERPC
 	bool "PowerPC BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_IA64
 	bool "IA-64 BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARM
 	bool "ARM BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARMTHUMB
 	bool "ARM-Thumb BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_SPARC
 	bool "SPARC BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
+endif
+
 config XZ_DEC_BCJ
 	bool
 	default n
-- 
1.7.10.4

[PATCH 2/2] decompressors: make the default XZ_BCJ_* config match the selected architecture

[Florian Fainelli]

This patch changes the defautl XZ_BCJ_* config symbol to match the
configured architecture. It is perfectly legitimate to support multiple
XZ BCJ filters for different architectures (e.g.: to mount foreign
squashfs/xz compressed filesystems), it is however more natural not to
select them all by default, but only the one matching the configured
architecture.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 lib/xz/Kconfig |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index 12d2d777..90264dd 100644
--- a/lib/xz/Kconfig
+++ b/lib/xz/Kconfig
@@ -10,32 +10,32 @@ if XZ_DEC
 
 config XZ_DEC_X86
 	bool "x86 BCJ filter decoder" if EXPERT
-	default y
+	default y if X86
 	select XZ_DEC_BCJ
 
 config XZ_DEC_POWERPC
 	bool "PowerPC BCJ filter decoder" if EXPERT
-	default y
+	default y if POWERPC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_IA64
 	bool "IA-64 BCJ filter decoder" if EXPERT
-	default y
+	default y if IA64
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARM
 	bool "ARM BCJ filter decoder" if EXPERT
-	default y
+	default y if ARM
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARMTHUMB
 	bool "ARM-Thumb BCJ filter decoder" if EXPERT
-	default y
+	default y if (ARM && ARM_THUMB)
 	select XZ_DEC_BCJ
 
 config XZ_DEC_SPARC
 	bool "SPARC BCJ filter decoder" if EXPERT
-	default y
+	default y if SPARC64
 	select XZ_DEC_BCJ
 
 endif
-- 
1.7.10.4

Re: [PATCH 2/2] decompressors: make the default XZ_BCJ_* config match the selected architecture

[Lasse Collin]

On 2013-01-15 Florian Fainelli wrote:
> This patch changes the defautl XZ_BCJ_* config symbol to match the
> configured architecture. It is perfectly legitimate to support
> multiple XZ BCJ filters for different architectures (e.g.: to mount
> foreign squashfs/xz compressed filesystems), it is however more
> natural not to select them all by default, but only the one matching
> the configured architecture.

I don't have a strong opinion on what is the best default setting, so
it's fine to me that the default is changed if that's what people
prefer.

>  config XZ_DEC_X86
>  	bool "x86 BCJ filter decoder" if EXPERT
> -	default y
> +	default y if X86
>  	select XZ_DEC_BCJ
[...]

I think the "if EXPERT" strings should be dropped when all BCJ filters
aren't enabled by default. One should be able to enable all filters
without enabling EXPERT.

-- 
Lasse Collin  |  IRC: Larhzu @ IRCnet & Freenode

Re: [PATCH 2/2] decompressors: make the default XZ_BCJ_* config match the selected architecture

[Florian Fainelli]

On 01/15/2013 07:11 PM, Lasse Collin wrote:
> On 2013-01-15 Florian Fainelli wrote:
>> This patch changes the defautl XZ_BCJ_* config symbol to match the
>> configured architecture. It is perfectly legitimate to support
>> multiple XZ BCJ filters for different architectures (e.g.: to mount
>> foreign squashfs/xz compressed filesystems), it is however more
>> natural not to select them all by default, but only the one matching
>> the configured architecture.
> I don't have a strong opinion on what is the best default setting, so
> it's fine to me that the default is changed if that's what people
> prefer.

I think it does make sense to have the default match the configured 
architecture, as it is very likely going to be used for that purpose.

>
>>   config XZ_DEC_X86
>>   	bool "x86 BCJ filter decoder" if EXPERT
>> -	default y
>> +	default y if X86
>>   	select XZ_DEC_BCJ
> [...]
>
> I think the "if EXPERT" strings should be dropped when all BCJ filters
> aren't enabled by default. One should be able to enable all filters
> without enabling EXPERT.
Ok, this would probably be a third patch, since my two patches basically 
just modify what was already there, but I agree with you, even though 
EXPERT is enabled by default on most architectures and defconfigs.
--
Florian

Re: [PATCH 2/2] decompressors: make the default XZ_BCJ_* config match the selected architecture

[Lasse Collin]

On 2013-01-16 Florian Fainelli wrote:
> On 01/15/2013 07:11 PM, Lasse Collin wrote:
> > On 2013-01-15 Florian Fainelli wrote:
> >>   config XZ_DEC_X86
> >>   	bool "x86 BCJ filter decoder" if EXPERT
> >> -	default y
> >> +	default y if X86
> >>   	select XZ_DEC_BCJ
> > [...]
> >
> > I think the "if EXPERT" strings should be dropped when all BCJ
> > filters aren't enabled by default. One should be able to enable all
> > filters without enabling EXPERT.
> Ok, this would probably be a third patch, since my two patches
> basically just modify what was already there, but I agree with you,
> even though EXPERT is enabled by default on most architectures and
> defconfigs. --

At least in x86_64_defconfig EXPERT isn't enabled. I'm fine with your
patches once also the "if EXPERT" strings are removed.

Acked-by: Lasse Collin <lasse.collin@tukaani.org>

-- 
Lasse Collin  |  IRC: Larhzu @ IRCnet & Freenode

[PATCH 1/3] decompressors: group XZ_DEC_* symbols under an if XZ_BCJ / endif

[Florian Fainelli]

This patch groups all architecture-specific BCJ filter configuration
symbols under an if XZ_BCJ / endif statement.

Acked-by: Lasse Collin <lasse.collin@tukaani.org>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 lib/xz/Kconfig |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index 60a6088..12d2d777 100644
--- a/lib/xz/Kconfig
+++ b/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
 	select XZ_DEC_BCJ
 
 config XZ_DEC_POWERPC
 	bool "PowerPC BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_IA64
 	bool "IA-64 BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARM
 	bool "ARM BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARMTHUMB
 	bool "ARM-Thumb BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_SPARC
 	bool "SPARC BCJ filter decoder" if EXPERT
 	default y
-	depends on XZ_DEC
 	select XZ_DEC_BCJ
 
+endif
+
 config XZ_DEC_BCJ
 	bool
 	default n
-- 
1.7.10.4

[PATCH 2/3] decompressors: drop dependency on CONFIG_EXPERT

[Florian Fainelli]

This patch removes the XZ_DEC_* depedencey on CONFIG_EXPERT as
recommended by Lasse Colin.

Acked-by: Lasse Collin <lasse.collin@tukaani.org>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 lib/xz/Kconfig |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index 12d2d777..8d46470 100644
--- a/lib/xz/Kconfig
+++ b/lib/xz/Kconfig
@@ -9,32 +9,32 @@ config XZ_DEC
 if XZ_DEC
 
 config XZ_DEC_X86
-	bool "x86 BCJ filter decoder" if EXPERT
+	bool "x86 BCJ filter decoder"
 	default y
 	select XZ_DEC_BCJ
 
 config XZ_DEC_POWERPC
-	bool "PowerPC BCJ filter decoder" if EXPERT
+	bool "PowerPC BCJ filter decoder"
 	default y
 	select XZ_DEC_BCJ
 
 config XZ_DEC_IA64
-	bool "IA-64 BCJ filter decoder" if EXPERT
+	bool "IA-64 BCJ filter decoder"
 	default y
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARM
-	bool "ARM BCJ filter decoder" if EXPERT
+	bool "ARM BCJ filter decoder"
 	default y
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARMTHUMB
-	bool "ARM-Thumb BCJ filter decoder" if EXPERT
+	bool "ARM-Thumb BCJ filter decoder"
 	default y
 	select XZ_DEC_BCJ
 
 config XZ_DEC_SPARC
-	bool "SPARC BCJ filter decoder" if EXPERT
+	bool "SPARC BCJ filter decoder"
 	default y
 	select XZ_DEC_BCJ
 
-- 
1.7.10.4

[PATCH 3/3] decompressors: make the default XZ_DEC_* config match the selected architecture

[Florian Fainelli]

This patch changes the defautl XZ_DEC_* config symbol to match the
configured architecture. It is perfectly legitimate to support multiple
XZ BCJ filters for different architectures (e.g.: to mount foreign
squashfs/xz compressed filesystems), it is however more natural not to
select them all by default, but only the one matching the configured
architecture.

Acked-by: Lasse Collin <lasse.collin@tukaani.org>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 lib/xz/Kconfig |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index 8d46470..82a04d7 100644
--- a/lib/xz/Kconfig
+++ b/lib/xz/Kconfig
@@ -10,32 +10,32 @@ if XZ_DEC
 
 config XZ_DEC_X86
 	bool "x86 BCJ filter decoder"
-	default y
+	default y if X86
 	select XZ_DEC_BCJ
 
 config XZ_DEC_POWERPC
 	bool "PowerPC BCJ filter decoder"
-	default y
+	default y if POWERPC
 	select XZ_DEC_BCJ
 
 config XZ_DEC_IA64
 	bool "IA-64 BCJ filter decoder"
-	default y
+	default y if IA64
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARM
 	bool "ARM BCJ filter decoder"
-	default y
+	default y if ARM
 	select XZ_DEC_BCJ
 
 config XZ_DEC_ARMTHUMB
 	bool "ARM-Thumb BCJ filter decoder"
-	default y
+	default y if (ARM && ARM_THUMB)
 	select XZ_DEC_BCJ
 
 config XZ_DEC_SPARC
 	bool "SPARC BCJ filter decoder"
-	default y
+	default y if SPARC
 	select XZ_DEC_BCJ
 
 endif
-- 
1.7.10.4