From patchwork Wed Jul 8 13:33:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Robert P. J. Day" X-Patchwork-Id: 34620 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n68DZe1A020991 for ; Wed, 8 Jul 2009 13:35:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754542AbZGHNfk (ORCPT ); Wed, 8 Jul 2009 09:35:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755042AbZGHNfk (ORCPT ); Wed, 8 Jul 2009 09:35:40 -0400 Received: from astoria.ccjclearline.com ([64.235.106.9]:51436 "EHLO astoria.ccjclearline.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753708AbZGHNfj (ORCPT ); Wed, 8 Jul 2009 09:35:39 -0400 Received: from cpe002129687b04-cm001225dbafb6.cpe.net.cable.rogers.com ([99.235.241.187] helo=crashcourse.ca) by astoria.ccjclearline.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1MOXmY-0002tW-Ms for linux-kbuild@vger.kernel.org; Wed, 08 Jul 2009 10:05:58 -0400 Date: Wed, 8 Jul 2009 09:33:25 -0400 (EDT) From: "Robert P. J. Day" X-X-Sender: rpjday@localhost To: kbuild devel list Subject: [PATCH] KBUILD: Centralize the compression tests for BLK_DEV_INITRD. Message-ID: User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - astoria.ccjclearline.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - crashcourse.ca X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org 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. Signed-off-by: Robert P. J. Day --- ======================================================================== 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 ======================================================================== -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/usr/Kconfig b/usr/Kconfig index 1c3039f..a913b3a 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -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