From patchwork Thu Jul 29 14:03:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12408829 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90427C4338F for ; Thu, 29 Jul 2021 14:06:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5ED5060F5E for ; Thu, 29 Jul 2021 14:06:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5ED5060F5E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Tkv/Qwra+5zY7pTsvsddQ046F56iEi0UeuCYl4YrhR0=; b=lZALF9sSRfTurf PEz3MlF54jdF3Rra0cajlwVuuIArXqAiuJWsyTHDNld1eyPRnb41TCEC07SFV3LPdDfhzTz9RlDmG sd1dJMDVMLyQN/spqGAGBwyAeKcaumSdMV3lNqXgitqGQfxnwkpqj2mXonprbg2+Y+Mb4WtLLtpHK CMSSbbaOG3T63ShYAdxETHRqO0Ll8Vvc60jCq8yweG0TeYp7zJ05LNNLkdmQF5VPjOXjT8HGFH0UU 70MpoV++0pg83VRLeFq8owliUv022bXHZMYluD5ytgyHGjBE3Frg+gFA4PxKZAd8ZRrSkTootaPK2 fiXPD/riyzndUsQ9mcyA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m96el-004SGn-V5; Thu, 29 Jul 2021 14:05:04 +0000 Received: from conuserg-07.nifty.com ([210.131.2.74]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m96eh-004SEA-4d for linux-arm-kernel@lists.infradead.org; Thu, 29 Jul 2021 14:05:00 +0000 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-07.nifty.com with ESMTP id 16TE3sm5009142; Thu, 29 Jul 2021 23:03:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 16TE3sm5009142 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1627567435; bh=bzFoF25ekptihRaZTAxt4g/hfk6mrcBC87PY0m7n+M0=; h=From:To:Cc:Subject:Date:From; b=Zq2g9KaD7MavnWzdVPtTYEqnK0ZbyLyiCyduQKLBeMDOROeXcTEsC21Tm4GCLz7O6 q5sR0rqjiTf/4uN6P2Kw2qh6qEbPfVFjzzEmhqrFX+4K/VOplk6dydpqT46PinF6XK gZw0C6NXs06P2ODIv31SwpbyxS8prrT7GXDpTdnsLN/UQNwcrNhePeCPolVopBj3+j 1V1OyiojEgOBRlgvyk0PGJp8uFH+nkpbyCNk+ZfgA8hA6S+N34PD9QSEqrqM+SNvJA DGODXtcrN02eCqFi/0Tzl4IpItP1LwEGRqJs+sY78CAWDrefJlZ0f+iLgRzw2EdKxG qmT3Gr6WIauVg== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: patches@arm.linux.org.uk Cc: Masahiro Yamada , Arnd Bergmann , Kees Cook , Krzysztof Kozlowski , =?utf-8?q?Uwe_Klei?= =?utf-8?q?ne-K=C3=B6nig?= , linux-kernel@vger.kernel.org, Nathan Chancellor , Viresh Kumar , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: move the (z/u)install rules to arch/arm/Makefile Date: Thu, 29 Jul 2021 23:03:51 +0900 Message-Id: <20210729140351.442678-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210729_070459_457735_7C8B740E X-CRM114-Status: UNSURE ( 9.30 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Currently, the (z/u)install targets in arch/arm/Makefile descend into arch/arm/boot/Makefile to invoke the shell script, but there is no good reason to do so. arch/arm/Makefile can run the shell script directly. Signed-off-by: Masahiro Yamada Acked-by: Uwe Kleine-König --- KernelVersion: v5.14-rc1 arch/arm/Makefile | 3 ++- arch/arm/boot/Makefile | 14 +------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 173da685a52e..847c31e7c368 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -308,7 +308,8 @@ $(BOOT_TARGETS): vmlinux @$(kecho) ' Kernel: $(boot)/$@ is ready' $(INSTALL_TARGETS): - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ + $(CONFIG_SHELL) $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" \ + $(boot)/$(patsubst %install,%Image,$@) System.map "$(INSTALL_PATH)" PHONY += vdso_install vdso_install: diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 0b3cd7a33a26..54a09f9464fb 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -96,23 +96,11 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE $(obj)/bootpImage: $(obj)/bootp/bootp FORCE $(call if_changed,objcopy) -PHONY += initrd install zinstall uinstall +PHONY += initrd initrd: @test "$(INITRD_PHYS)" != "" || \ (echo This machine does not support INITRD; exit -1) @test "$(INITRD)" != "" || \ (echo You must specify INITRD; exit -1) -install: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ - $(obj)/Image System.map "$(INSTALL_PATH)" - -zinstall: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ - $(obj)/zImage System.map "$(INSTALL_PATH)" - -uinstall: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ - $(obj)/uImage System.map "$(INSTALL_PATH)" - subdir- := bootp compressed dts