aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-04-17 16:58:36 -0700
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-09-27 02:50:40 +0200
commit89c8472033a23319b42bdf219726f253d21cfe19 (patch)
treea035ed11e5cdf9bc44c5908cd19368614c63480b /arch/arm/Makefile
parent08895a8b6b06ed2323cd97a36ee40a116b3db8ed (diff)
downloadkernel_i9300_mainline-89c8472033a23319b42bdf219726f253d21cfe19.zip
kernel_i9300_mainline-89c8472033a23319b42bdf219726f253d21cfe19.tar.gz
kernel_i9300_mainline-89c8472033a23319b42bdf219726f253d21cfe19.tar.bz2
ARM: convert build of appended dtb zImage to list of dtbs
Allow CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES to specify a space separated list of dtbs to append to the zImage, and name the resulting file zImage-dtb Change-Id: Ied5d0bafbd1d01fc1f109c15c4283de7029903c9 Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 61f6ccc..eb564e2 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -299,6 +299,8 @@ libs-y := arch/arm/lib/ $(libs-y)
# Default target when executing plain make
ifeq ($(CONFIG_XIP_KERNEL),y)
KBUILD_IMAGE := xipImage
+else ifeq ($(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE),y)
+KBUILD_IMAGE := zImage-dtb
else
KBUILD_IMAGE := zImage
endif
@@ -350,6 +352,9 @@ ifeq ($(CONFIG_VDSO),y)
$(Q)$(MAKE) $(build)=arch/arm/vdso $@
endif
+zImage-dtb: vmlinux scripts dtbs
+ $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
+
# We use MRPROPER_FILES and CLEAN_FILES now
archclean:
$(Q)$(MAKE) $(clean)=$(boot)