aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/Makefile
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-05-08 13:50:33 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-05-08 13:50:33 -0700
commit1f76bce8544acd38f7bb1e822540f8ca521e1b7f (patch)
tree9a86d16e969a439db8221e5c4634f833da6a1340 /arch/arm/boot/Makefile
parent832adcc75834fd8c44b64649b5f0317193dd6826 (diff)
downloadvexpress-lsk-1f76bce8544acd38f7bb1e822540f8ca521e1b7f.tar.gz
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/boot/Makefile')
-rw-r--r--arch/arm/boot/Makefile12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 3310df3a056..84aa2caf07e 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -27,14 +27,6 @@ export ZRELADDR INITRD_PHYS PARAMS_PHYS
targets := Image zImage xipImage bootpImage uImage
-DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))
-ifneq ($(DTB_NAMES),)
-DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
-else
-DTB_LIST := $(dtb-y)
-endif
-DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST))
-
ifeq ($(CONFIG_XIP_KERNEL),y)
$(obj)/xipImage: vmlinux FORCE
@@ -63,10 +55,6 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
$(call if_changed,objcopy)
@$(kecho) ' Kernel: $@ is ready'
-$(obj)/zImage-dtb: $(obj)/zImage $(DTB_OBJS) FORCE
- $(call if_changed,cat)
- @echo ' Kernel: $@ is ready'
-
endif
ifneq ($(LOADADDR),)