summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2021-07-29 23:07:06 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2021-09-22 09:26:24 +0900
commit89b4db61c76197b899f9dc3dc06ea7c3a60729b8 (patch)
tree64cb5df4849c2f8e90a6ed6691982549f9ff593b
parente4e737bb5c170df6135a127739a9e6148ee3da82 (diff)
downloadlinux-89b4db61c76197b899f9dc3dc06ea7c3a60729b8.tar.bz2
nios2: move the install rule to arch/nios2/Makefile
Currently, the install target in arch/nios2/Makefile descends into arch/nios2/boot/Makefile to invoke the shell script, but it is no good reason to do so. arch/nios2/Makefile can run the shell script directly. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-rw-r--r--arch/nios2/Makefile3
-rw-r--r--arch/nios2/boot/Makefile3
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile
index 52c03e60b114..72e8ff065cf7 100644
--- a/arch/nios2/Makefile
+++ b/arch/nios2/Makefile
@@ -60,7 +60,8 @@ $(BOOT_TARGETS): vmlinux
$(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@
install:
- $(Q)$(MAKE) $(build)=$(nios2-boot) BOOTIMAGE=$(KBUILD_IMAGE) install
+ sh $(srctree)/$(nios2-boot)/install.sh $(KERNELRELEASE) \
+ $(KBUILD_IMAGE) System.map "$(INSTALL_PATH)"
define archhelp
echo '* vmImage - Kernel-only image for U-Boot ($(KBUILD_IMAGE))'
diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile
index 37dfc7e584bc..8c3ad76602f3 100644
--- a/arch/nios2/boot/Makefile
+++ b/arch/nios2/boot/Makefile
@@ -30,6 +30,3 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
$(obj)/compressed/vmlinux: $(obj)/vmlinux.gz FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
-
-install:
- sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"