Skip to content

Commit

Permalink
s390: move the install rule to arch/s390/Makefile
Browse files Browse the repository at this point in the history
Currently, the install target in arch/s390/Makefile descends into
arch/s390/boot/Makefile to invoke the shell script, but there is no
good reason to do so.

arch/s390/Makefile can run the shell script directly.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20210729142338.446002-1-masahiroy@kernel.org
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
  • Loading branch information
Masahiro Yamada authored and Heiko Carstens committed Jul 30, 2021
1 parent e37b3dd commit d80d3ea
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 2 additions & 1 deletion arch/s390/Makefile
Original file line number Diff line number Diff line change
@@ -142,7 +142,8 @@ all: bzImage
KBUILD_IMAGE := $(boot)/bzImage

install:
$(Q)$(MAKE) $(build)=$(boot) $@
sh -x $(srctree)/$(boot)/install.sh $(KERNELRELEASE) $(KBUILD_IMAGE) \
System.map "$(INSTALL_PATH)"

bzImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
4 changes: 0 additions & 4 deletions arch/s390/boot/Makefile
Original file line number Diff line number Diff line change
@@ -70,7 +70,3 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE

$(obj)/startup.a: $(OBJECTS) FORCE
$(call if_changed,ar)

install:
sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
System.map "$(INSTALL_PATH)"

0 comments on commit d80d3ea

Please sign in to comment.