Skip to content

Commit 399c1ec

Browse files
masahir0ypalmer-dabbelt
authored andcommitted
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 <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent d593553 commit 399c1ec

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

arch/riscv/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,11 @@ $(BOOT_TARGETS): vmlinux
132132
Image.%: Image
133133
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
134134

135-
zinstall install:
136-
$(Q)$(MAKE) $(build)=$(boot) $@
135+
install: install-image = Image
136+
zinstall: install-image = Image.gz
137+
install zinstall:
138+
$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
139+
$(boot)/$(install-image) System.map "$(INSTALL_PATH)"
137140

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

arch/riscv/boot/Makefile

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

5959
$(obj)/loader.bin: $(obj)/loader FORCE
6060
$(call if_changed,objcopy)
61-
62-
install:
63-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
64-
$(obj)/Image System.map "$(INSTALL_PATH)"
65-
66-
zinstall:
67-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
68-
$(obj)/Image.gz System.map "$(INSTALL_PATH)"

0 commit comments

Comments
 (0)