Commit d7bcc5e2 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Russell King (Oracle)
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent b08cae33

arch/arm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -308,7 +308,8 @@ $(BOOT_TARGETS): vmlinux 
	@$(kecho) '  Kernel: $(boot)/$@ is ready'



$(INSTALL_TARGETS):

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@

	$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" \

	$(boot)/$(patsubst %install,%Image,$@) System.map "$(INSTALL_PATH)"



PHONY += vdso_install

vdso_install:

arch/arm/boot/Makefile

+1 −13
Original line number Diff line number Diff line
@@ -96,23 +96,11 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE 
$(obj)/bootpImage: $(obj)/bootp/bootp FORCE

	$(call if_changed,objcopy)



PHONY += initrd install zinstall uinstall

PHONY += initrd

initrd:

	@test "$(INITRD_PHYS)" != "" || \

	(echo This machine does not support INITRD; exit -1)

	@test "$(INITRD)" != "" || \

	(echo You must specify INITRD; exit -1)



install:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/Image System.map "$(INSTALL_PATH)"



zinstall:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/zImage System.map "$(INSTALL_PATH)"



uinstall:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/uImage System.map "$(INSTALL_PATH)"



subdir-	    := bootp compressed dts