Skip to contentSkip to conversation

KBUILD: Centralize the compression tests for BLK_DEV_INITRD.

PATCH In review Robert P. J. Day 2 participants 2 messages Jul 8, 2009 – Jul 17, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KBUILD: Centralize the compression tests for BLK_DEV_INITRD.

Factor out the tests for BLK_DEV_INITRD from the compression entries and wrap the whole thing in a single test to make it more visually obvious what's happening.

---

usr/Kconfig +4 -3
index 1c3039f..a913b3a 100644
@@ -45,10 +45,11 @@ config INITRAMFS_ROOT_GID
 
 	  If you are not sure, leave it set to "0".
 
+if BLK_DEV_INITRD
+
 config RD_GZIP
 	bool "Support initial ramdisks compressed using gzip" if EMBEDDED
 	default y
-	depends on BLK_DEV_INITRD
 	select DECOMPRESS_GZIP
 	help
 	  Support loading of a gzip encoded initial ramdisk or cpio buffer.
@@ -57,7 +58,6 @@ config RD_GZIP
 config RD_BZIP2
 	bool "Support initial ramdisks compressed using bzip2" if EMBEDDED
 	default !EMBEDDED
-	depends on BLK_DEV_INITRD
 	select DECOMPRESS_BZIP2
 	help
 	  Support loading of a bzip2 encoded initial ramdisk or cpio buffer
@@ -66,12 +66,13 @@ config RD_BZIP2
 config RD_LZMA
 	bool "Support initial ramdisks compressed using LZMA" if EMBEDDED
 	default !EMBEDDED
-	depends on BLK_DEV_INITRD
 	select DECOMPRESS_LZMA
 	help
 	  Support loading of a LZMA encoded initial ramdisk or cpio buffer
 	  If unsure, say N.
 
+endif # BLK_DEV_INITRD
+
 choice
 	prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!=""
 	help

========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA

Linux Consulting, Training and Annoying Kernel Pedantry.

Web page:                                          http://crashcourse.ca
Linked In:                             http://www.linkedin.com/in/rpjday
Twitter:                                       http://twitter.com/rpjday

========================================================================

#1 lore raw
Quoted 7 lines · Robert P. J. Day

Factor out the tests for BLK_DEV_INITRD from the compression entries and wrap the whole thing in a single test to make it more visually obvious what's happening.

This does not increase readability.
If you look at RD_LZMA you have to look three options above to realize that this is dependent on BLK_DEV_INITRD.

Sam