diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-05-08 13:50:33 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-05-08 13:50:33 -0700 |
| commit | 1f76bce8544acd38f7bb1e822540f8ca521e1b7f (patch) | |
| tree | 9a86d16e969a439db8221e5c4634f833da6a1340 /arch/arm/Makefile | |
| parent | 832adcc75834fd8c44b64649b5f0317193dd6826 (diff) | |
Revert "ARM: convert build of appended dtb zImage to list of dtbs"v3.9/android-fixes
This reverts commit 5e9468632ea81e7d17fc9bd4457acbaffda7b370.
Tixy was seeing trouble with "make dtbs" and "make my-boards.dtb",
and found reverting this resolves the issue. So for now lets
revert this.
Reported-by: Jon Medhurst (Tixy) <tixy@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index fe9ffb358c4..671f2211a6e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -269,7 +269,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 +KBUILD_IMAGE := zImage-dtb.$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAME) else KBUILD_IMAGE := zImage endif @@ -301,9 +301,6 @@ zinstall uinstall install: vmlinux dtbs: scripts $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs -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) |