Unverified Commit 399c1ec8 authored Jul 29, 2021 by Masahiro Yamada Committed by Palmer Dabbelt Sep 10, 2021

riscv: move the (z)install rules to arch/riscv/Makefile



Currently, the (z)install targets in arch/riscv/Makefile descend into
arch/riscv/boot/Makefile to invoke the shell script, but there is no
good reason to do so.

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

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>

parent d5935537

arch/riscv/Makefile

+5 −2

Original line number	Diff line number	Diff line
		@@ -132,8 +132,11 @@ $(BOOT_TARGETS): vmlinux
		Image.%: Image
		$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

		zinstall install:
		$(Q)$(MAKE) $(build)=$(boot) $@
		install: install-image = Image
		zinstall: install-image = Image.gz
		install zinstall:
		$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
		$(boot)/$(install-image) System.map "$(INSTALL_PATH)"

		archclean:
		$(Q)$(MAKE) $(clean)=$(boot)

arch/riscv/boot/Makefile

+0 −8

Original line number	Diff line number	Diff line
		@@ -58,11 +58,3 @@ $(obj)/Image.lzo: $(obj)/Image FORCE

		$(obj)/loader.bin: $(obj)/loader FORCE
		$(call if_changed,objcopy)

		install:
		$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
		$(obj)/Image System.map "$(INSTALL_PATH)"

		zinstall:
		$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
		$(obj)/Image.gz System.map "$(INSTALL_PATH)"