From patchwork Fri Nov 9 19:02:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Borowski X-Patchwork-Id: 10676443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E695B13BF for ; Fri, 9 Nov 2018 19:03:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA5472EC54 for ; Fri, 9 Nov 2018 19:03:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD7122F103; Fri, 9 Nov 2018 19:03:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55C292F102 for ; Fri, 9 Nov 2018 19:03:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728972AbeKJEpb (ORCPT ); Fri, 9 Nov 2018 23:45:31 -0500 Received: from tartarus.angband.pl ([54.37.238.230]:51658 "EHLO tartarus.angband.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728676AbeKJEpa (ORCPT ); Fri, 9 Nov 2018 23:45:30 -0500 Received: from 89-64-163-218.dynamic.chello.pl ([89.64.163.218] helo=barad-dur.angband.pl) by tartarus.angband.pl with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gLC42-00055a-0j; Fri, 09 Nov 2018 20:03:31 +0100 Received: from kholdan.angband.pl ([2001:470:64f4::5]) by barad-dur.angband.pl with smtp (Exim 4.89) (envelope-from ) id 1gLC40-0005AD-Dx; Fri, 09 Nov 2018 20:03:29 +0100 Received: by kholdan.angband.pl (sSMTP sendmail emulation); Fri, 09 Nov 2018 20:03:28 +0100 From: Adam Borowski To: linux-kernel@vger.kernel.org, Nick Terrell , Russell King , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Ralf Baechle , Paul Burton , James Hogan , linux-mips@linux-mips.org, Jonas Bonn , Stefan Kristiansson , Stafford Horne , openrisc@lists.librecores.org, "James E.J. Bottomley" , Helge Deller , linux-parisc@vger.kernel.org, Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org, Martin Schwidefsky , Heiko Carstens , linux-s390@vger.kernel.org, Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, Chris Zankel , Max Filippov , linux-xtensa@linux-xtensa.org Cc: Adam Borowski Date: Fri, 9 Nov 2018 20:02:59 +0100 Message-Id: <20181109190304.8573-12-kilobyte@angband.pl> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109190304.8573-1-kilobyte@angband.pl> References: <20181109185953.xwyelyqnygbskkxk@angband.pl> <20181109190304.8573-1-kilobyte@angband.pl> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 89.64.163.218 X-SA-Exim-Mail-From: kilobyte@angband.pl Subject: [PATCH 12/17] Kconfig: Remove support for LZMA-compressed initrd X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on tartarus.angband.pl) Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Obsoleted by XZ. The config option for compressing the kernel stays, as some archs have a bootloader outside the kernel that wants LZMA. Signed-off-by: Adam Borowski --- Makefile | 1 - usr/Kconfig | 28 ++-------------------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index c812467bfe11..97e4bf26a6d3 100644 --- a/Makefile +++ b/Makefile @@ -938,7 +938,6 @@ export mod_compress_cmd # This shall be used by the dracut(8) tool while creating an initramfs image. # INITRD_COMPRESS-y := gzip -INITRD_COMPRESS-$(CONFIG_RD_LZMA) := lzma INITRD_COMPRESS-$(CONFIG_RD_XZ) := xz INITRD_COMPRESS-$(CONFIG_RD_LZO) := lzo INITRD_COMPRESS-$(CONFIG_RD_LZ4) := lz4 diff --git a/usr/Kconfig b/usr/Kconfig index 05b6be569041..8d99edacabc9 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -61,15 +61,6 @@ config RD_GZIP Support loading of a gzip encoded initial ramdisk or cpio buffer. If unsure, say Y. -config RD_LZMA - bool "Support initial ramdisk/ramfs compressed using LZMA" - default y - depends on BLK_DEV_INITRD - select DECOMPRESS_LZMA - help - Support loading of a LZMA encoded initial ramdisk or cpio buffer - If unsure, say N. - config RD_XZ bool "Support initial ramdisk/ramfs compressed using XZ" depends on BLK_DEV_INITRD @@ -118,8 +109,8 @@ choice when building a kernel. Decompression speed is relevant at each boot. Also the memory usage during decompression may become relevant on memory constrained systems. This is usually based on the - dictionary size of the algorithm with algorithms like XZ and LZMA - featuring large dictionary sizes. + dictionary size of the algorithm with algorithms like XZ featuring + large dictionary sizes. High compression options are mostly useful for users who are low on RAM, since it reduces the memory consumption during @@ -152,19 +143,6 @@ config INITRAMFS_COMPRESSION_GZIP supported by your build system as the gzip tool is present by default on most distros. -config INITRAMFS_COMPRESSION_LZMA - bool "LZMA" - depends on RD_LZMA - help - This algorithm's compression ratio is best but has a large dictionary - size which might cause issues in memory constrained systems. - Decompression speed is between the other choices. Compression is - slowest. The initramfs size is about 33% smaller with LZMA in - comparison to gzip. - - If you choose this, keep in mind that you may need to install the xz - or lzma tools to be able to compress the initram. - config INITRAMFS_COMPRESSION_XZ bool "XZ" depends on RD_XZ @@ -219,7 +197,6 @@ config INITRAMFS_COMPRESSION string default "" if INITRAMFS_COMPRESSION_NONE default ".gz" if INITRAMFS_COMPRESSION_GZIP - default ".lzma" if INITRAMFS_COMPRESSION_LZMA default ".xz" if INITRAMFS_COMPRESSION_XZ default ".lzo" if INITRAMFS_COMPRESSION_LZO default ".lz4" if INITRAMFS_COMPRESSION_LZ4 @@ -228,6 +205,5 @@ config INITRAMFS_COMPRESSION default ".lz4" if RD_LZ4 default ".lzo" if RD_LZO default ".xz" if RD_XZ - default ".lzma" if RD_LZMA default ".zst" if RD_ZSTD default ""