diff mbox series

arm, kbuild: Add new 'xipinstall' target

Message ID 20200628082428.647002-1-yangx.jy@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show
Series arm, kbuild: Add new 'xipinstall' target | expand

Commit Message

Xiao Yang June 28, 2020, 8:24 a.m. UTC 
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 <lkp@intel.com>
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 arch/arm/Makefile      | 3 ++-
 arch/arm/boot/Makefile | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
diff mbox series

Patch

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=<path>)'
   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)"