diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-07-31 23:41:39 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:18:05 -0700 |
| commit | ccf495752b106f4343a971b32441c358f8256ad6 (patch) | |
| tree | 6eaab42abd5aa971819abbb16e277189a75f1ec6 /arch/arm/Makefile | |
| parent | 65832a6d9f2603a1e6a1d12a313b7b7f823ac9f6 (diff) | |
UPSTREAM Revert Android "ARM: convert build of appended dtb zImage to list of dtbs"
This reverts commit 5e9468632ea81e7d17fc9bd4457acbaffda7b370.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
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 276b9cb2085a..a5d9cefc9155 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) |