Skip to contentSkip to conversation

decompressors: group XZ_DEC_* symbols under an if XZ_BCJ / endif

PATCH In review Florian Fainelli 2 participants 8 messages Jan 15, 2013 – Jan 25, 2013 Xz embedded

lore
Share & tools
lore
#0 lore raw

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

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

---
 lib/xz/Kconfig |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
lib/xz/Kconfig +4 -6
index 60a6088..12d2d777 100644
@@ -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
Signature · 1 line
1.7.10.4
#1 lore raw

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

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.

---
 lib/xz/Kconfig |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
lib/xz/Kconfig +6 -6
index 12d2d777..90264dd 100644
@@ -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
Signature · 1 line
1.7.10.4
maintainer
#2 lore raw

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

Quoted 6 lines · 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.

lib/xz/Kconfig if XZ_DEC · line 14

Quoted 5 lines

config XZ_DEC_X86

lib/xz/Kconfig +1 -1
 	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.

Signature · 1 line
Lasse Collin  |  IRC: Larhzu @ IRCnet & Freenode
#3 lore raw

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

Quoted 10 lines · Lasse Collin
Quoted 6 lines · 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.

Quoted 11 lines

lib/xz/Kconfig if XZ_DEC · line 14

Quoted 6 lines

config XZ_DEC_X86
bool "x86 BCJ filter decoder" if EXPERT

lib/xz/Kconfig +1 -1
-	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

maintainer Acked-by
#4 lore raw

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

Quoted 9 lines · On 2013-01-16 Florian Fainelli wrote:
Quoted 8 lines · Lasse Collin
Quoted 5 lines · On 2013-01-15 Florian Fainelli wrote:

config XZ_DEC_X86
bool "x86 BCJ filter decoder" if EXPERT

lib/xz/Kconfig +1 -1
-	default y
+	default y if X86
  	select XZ_DEC_BCJ

[...]

Quoted 7 lines
Quoted 3 lines

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.

Signature · 1 line
Lasse Collin  |  IRC: Larhzu @ IRCnet & Freenode
#5 lore raw

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

In reply to Florian Fainelli

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

---
 lib/xz/Kconfig |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
lib/xz/Kconfig +4 -6
index 60a6088..12d2d777 100644
@@ -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
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH 2/3 decompressors: drop dependency on CONFIG_EXPERT

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

---
 lib/xz/Kconfig |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
lib/xz/Kconfig +6 -6
index 12d2d777..8d46470 100644
@@ -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
 
Signature · 1 line
1.7.10.4
#7 lore raw

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

In reply to 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.

---
 lib/xz/Kconfig |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
lib/xz/Kconfig +6 -6
index 8d46470..82a04d7 100644
@@ -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
Signature · 1 line
1.7.10.4