diff options
| author | Colin Cross <ccross@android.com> | 2013-04-17 16:58:36 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-02-16 13:54:07 -0800 |
| commit | 17d0350f21c8d5a52f16c53d165199a631f0ddd9 (patch) | |
| tree | e8bb1360c0d023f71cde654ccb73194f5835ecd5 /arch/arm/Makefile | |
| parent | d7a9d618735beedcc8b6368023c1a53a9f88c7cc (diff) | |
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/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 0ec5ca6d9381..88e479c8bcef 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -297,7 +297,7 @@ libs-y := arch/arm/lib/ $(libs-y) ifeq ($(CONFIG_XIP_KERNEL),y) KBUILD_IMAGE := xipImage else ifeq ($(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE),y) -KBUILD_IMAGE := zImage-dtb.$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAME) +KBUILD_IMAGE := zImage-dtb else KBUILD_IMAGE := zImage endif @@ -348,6 +348,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) |