From patchwork Thu Jul 16 20:26:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 6810841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B9FC29F2F0 for ; Thu, 16 Jul 2015 20:28:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C54F320732 for ; Thu, 16 Jul 2015 20:28:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE6E720723 for ; Thu, 16 Jul 2015 20:28:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZFpjq-0003Xg-TW; Thu, 16 Jul 2015 20:26:38 +0000 Received: from mail-pa0-f42.google.com ([209.85.220.42]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZFpjn-0003Nb-VI for linux-arm-kernel@lists.infradead.org; Thu, 16 Jul 2015 20:26:36 +0000 Received: by pachj5 with SMTP id hj5so48252121pac.3 for ; Thu, 16 Jul 2015 13:26:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TJLMtJPDABtZdsc7pPkFBomcfWA5j6ikukvbwyMApDQ=; b=FrI1IaxvyfbOcP9HZcbMzfA9xIGBCk7yRNHSYkgFkrNcP98mFwZAI/PlNDt1dbnZJc X1JWg7KBZS2q/HapyR4kyVsVoOAgsZ2HcS5MGbnd/GN5Pr4e1V77ZWp09qVqUeCRthLV sxhbWB6IihcOIWFEpW27yQGh2X+ooTVX3jKT7+EM+e2A4C8wqkUgfO4faSE+PEsXUdhz D0gzVDGe5UDkaLb8PQi8h7mv/rjnDSlCCGyXVEAVyvJf5Z8oWRZT63B6f/8NrEGZ1yhr PLaXVnWS2YLb1YTmE1+zHGNGL7jAN1GVFUY9kuJtPJHrMYp3I8VAd40It0R1nglwk3wz hjNg== X-Gm-Message-State: ALoCoQmKtsAfGNodEVhwfhNW2NE5+EaP+8lqpCdYWmzbG+BxNKxZtfxallXBkffv2PhvqXcPjKXz X-Received: by 10.70.48.34 with SMTP id i2mr22151639pdn.125.1437078375043; Thu, 16 Jul 2015 13:26:15 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by smtp.gmail.com with ESMTPSA id os7sm8855955pdb.51.2015.07.16.13.26.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jul 2015 13:26:14 -0700 (PDT) From: Olof Johansson To: Catalin Marinas , Will Deacon Subject: [PATCH v2] arm64: enable more compressed Image formats Date: Thu, 16 Jul 2015 13:26:16 -0700 Message-Id: <1437078376-13068-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 2.0.1.473.gc4d58ca X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150716_132636_043730_6BBB0A33 X-CRM114-Status: GOOD ( 10.05 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Olof Johansson , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Plumb up Makefile arguments for the already supported formats in the kbuild system: lz4, bzip2, lzma, and lzo. Note that just as with Image.gz, these images are not self-decompressing and the booting firmware still needs to handle decompression before launching the kernel image. Signed-off-by: Olof Johansson --- New in v2: Split Image and Image.% targets due to make warnings. arch/arm64/Makefile | 5 ++++- arch/arm64/boot/Makefile | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 4d2a925998f9..0953a97b5119 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -58,7 +58,10 @@ all: $(KBUILD_IMAGE) $(KBUILD_DTBS) boot := arch/arm64/boot -Image Image.gz: vmlinux +Image: vmlinux + $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + +Image.%: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ zinstall install: vmlinux diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index 5a0e3ab854a5..abcbba2f01ba 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -19,9 +19,21 @@ targets := Image Image.gz $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) +$(obj)/Image.bz2: $(obj)/Image FORCE + $(call if_changed,bzip2) + $(obj)/Image.gz: $(obj)/Image FORCE $(call if_changed,gzip) +$(obj)/Image.lz4: $(obj)/Image FORCE + $(call if_changed,lz4) + +$(obj)/Image.lzma: $(obj)/Image FORCE + $(call if_changed,lzma) + +$(obj)/Image.lzo: $(obj)/Image FORCE + $(call if_changed,lzo) + install: $(obj)/Image $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ $(obj)/Image System.map "$(INSTALL_PATH)"