Skip to content

Commit d7bcc5e

Browse files
masahir0yRussell King (Oracle)
authored andcommitted
ARM: 9102/1: move theinstall rules to arch/arm/Makefile
Currently, the (z/u)install targets in arch/arm/Makefile descend into arch/arm/boot/Makefile to invoke the shell script, but there is no good reason to do so. arch/arm/Makefile can run the shell script directly. Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent b08cae3 commit d7bcc5e

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

arch/arm/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ $(BOOT_TARGETS): vmlinux
308308
@$(kecho) ' Kernel: $(boot)/$@ is ready'
309309

310310
$(INSTALL_TARGETS):
311-
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
311+
$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" \
312+
$(boot)/$(patsubst %install,%Image,$@) System.map "$(INSTALL_PATH)"
312313

313314
PHONY += vdso_install
314315
vdso_install:

arch/arm/boot/Makefile

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,11 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
9696
$(obj)/bootpImage: $(obj)/bootp/bootp FORCE
9797
$(call if_changed,objcopy)
9898

99-
PHONY += initrd install zinstall uinstall
99+
PHONY += initrd
100100
initrd:
101101
@test "$(INITRD_PHYS)" != "" || \
102102
(echo This machine does not support INITRD; exit -1)
103103
@test "$(INITRD)" != "" || \
104104
(echo You must specify INITRD; exit -1)
105105

106-
install:
107-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
108-
$(obj)/Image System.map "$(INSTALL_PATH)"
109-
110-
zinstall:
111-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
112-
$(obj)/zImage System.map "$(INSTALL_PATH)"
113-
114-
uinstall:
115-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
116-
$(obj)/uImage System.map "$(INSTALL_PATH)"
117-
118106
subdir- := bootp compressed dts

0 commit comments

Comments
 (0)