Skip to content

Commit 70a4039

Browse files
masahir0yctmarinas
authored andcommitted
arm64: move the (z)install rules to arch/arm64/Makefile
Currently, the (z)install targets in arch/arm64/Makefile descend into arch/arm64/boot/Makefile to invoke the shell script, but there is no good reason to do so. arch/arm64/Makefile can run the shell script directly. Signed-off-by: Masahiro Yamada <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent b24b520 commit 70a4039

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

arch/arm64/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,11 @@ Image: vmlinux
165165
Image.%: Image
166166
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
167167

168-
zinstall install:
169-
$(Q)$(MAKE) $(build)=$(boot) $@
168+
install: install-image := Image
169+
zinstall: install-image := Image.gz
170+
install zinstall:
171+
$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
172+
$(boot)/$(install-image) System.map "$(INSTALL_PATH)"
170173

171174
PHONY += vdso_install
172175
vdso_install:

arch/arm64/boot/Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,3 @@ $(obj)/Image.lzma: $(obj)/Image FORCE
3535

3636
$(obj)/Image.lzo: $(obj)/Image FORCE
3737
$(call if_changed,lzo)
38-
39-
install:
40-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
41-
$(obj)/Image System.map "$(INSTALL_PATH)"
42-
43-
zinstall:
44-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
45-
$(obj)/Image.gz System.map "$(INSTALL_PATH)"

0 commit comments

Comments
 (0)