Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d9d0282 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild fix from Michal Marek:
 "Here is an ARM Makefile fix that you even acked.  After nobody wanted
  to take it, it ended up in the kbuild tree"

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  arm, kbuild: make "make install" not depend on vmlinux
parents f112bf85 19514fc6

arch/arm/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -296,10 +296,15 @@ archprepare: 
# Convert bzImage to zImage

bzImage: zImage



zImage Image xipImage bootpImage uImage: vmlinux

BOOT_TARGETS	= zImage Image xipImage bootpImage uImage

INSTALL_TARGETS	= zinstall uinstall install



PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)



$(BOOT_TARGETS): vmlinux

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



zinstall uinstall install: vmlinux

$(INSTALL_TARGETS):

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



%.dtb: | scripts

arch/arm/boot/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -95,24 +95,24 @@ initrd: 
	@test "$(INITRD)" != "" || \

	(echo You must specify INITRD; exit -1)



install: $(obj)/Image

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

install:

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

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



zinstall: $(obj)/zImage

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

zinstall:

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

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



uinstall: $(obj)/uImage

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

uinstall:

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

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



zi:

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

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

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



i:

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

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

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



subdir-	    := bootp compressed dts

arch/arm/boot/install.sh

+14 −0
Original line number Diff line number Diff line
@@ -20,6 +20,20 @@ 
#   $4 - default install path (blank if root directory)

#



verify () {

	if [ ! -f "$1" ]; then

		echo ""                                                   1>&2

		echo " *** Missing file: $1"                              1>&2

		echo ' *** You need to run "make" before "make install".' 1>&2

		echo ""                                                   1>&2

		exit 1

	fi

}



# Make sure the files actually exist

verify "$2"

verify "$3"



# User may have a custom install script

if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi

if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi