From patchwork Sun Jun 28 08:24:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 11629955 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AEF8C13B4 for ; Sun, 28 Jun 2020 08:40:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A008120857 for ; Sun, 28 Jun 2020 08:40:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726069AbgF1Ikp (ORCPT ); Sun, 28 Jun 2020 04:40:45 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:31859 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726038AbgF1Ikp (ORCPT ); Sun, 28 Jun 2020 04:40:45 -0400 X-IronPort-AV: E=Sophos;i="5.75,291,1589212800"; d="scan'208";a="95416047" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Jun 2020 16:40:04 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id 019B249B10FE; Sun, 28 Jun 2020 16:29:37 +0800 (CST) Received: from G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 28 Jun 2020 16:40:06 +0800 Received: from Fedora-31.g08.fujitsu.local (10.167.220.31) by G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sun, 28 Jun 2020 16:40:03 +0800 From: Xiao Yang To: , CC: , , Xiao Yang , kernel test robot Subject: [PATCH] arm, kbuild: Add new 'xipinstall' target Date: Sun, 28 Jun 2020 16:24:28 +0800 Message-ID: <20200628082428.647002-1-yangx.jy@cn.fujitsu.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-yoursite-MailScanner-ID: 019B249B10FE.AEFFF X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@cn.fujitsu.com X-Spam-Status: No Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Only xipImage is available when CONFIG_XIP_KERNEL is set but no target can be used to install xipImage currently, so add a new 'xipinstall' target. Reported-by: kernel test robot Signed-off-by: Xiao Yang --- arch/arm/Makefile | 3 ++- arch/arm/boot/Makefile | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 59fde2d598d8..063f973b77bf 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -332,7 +332,7 @@ archprepare: bzImage: zImage BOOT_TARGETS = zImage Image xipImage bootpImage uImage -INSTALL_TARGETS = zinstall uinstall install +INSTALL_TARGETS = zinstall uinstall install xipinstall PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS) @@ -369,6 +369,7 @@ define archhelp echo ' (supply initrd image via make variable INITRD=)' echo ' install - Install uncompressed kernel' echo ' zinstall - Install compressed kernel' + echo ' xipinstall - Install XIP kernel image' echo ' uinstall - Install U-Boot wrapped compressed kernel' echo ' Install using (your) ~/bin/$(INSTALLKERNEL) or' echo ' (distribution) /sbin/$(INSTALLKERNEL) or' diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 0b3cd7a33a26..c02b4961ff0a 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -96,7 +96,7 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE $(obj)/bootpImage: $(obj)/bootp/bootp FORCE $(call if_changed,objcopy) -PHONY += initrd install zinstall uinstall +PHONY += initrd install zinstall xipinstall uinstall initrd: @test "$(INITRD_PHYS)" != "" || \ (echo This machine does not support INITRD; exit -1) @@ -111,6 +111,10 @@ zinstall: $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ $(obj)/zImage System.map "$(INSTALL_PATH)" +xipinstall: + $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ + $(obj)/xipImage System.map "$(INSTALL_PATH)" + uinstall: $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ $(obj)/uImage System.map "$(INSTALL_PATH)"