summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2013-11-08 15:24:19 -0800
committerNitin Garg <nitin.garg@freescale.com>2014-04-21 22:35:27 -0500
commit19f12ec48fac39491be106158797fc9d5f890643 (patch)
tree1faefe217c1b7d1312a283b68e3c6125ec16a054 /arch
parentf5ff2ada91306b5d3b5a5f907b8519d3db2b7102 (diff)
ARM: Fix dtb list when DTB_IMAGE_NAMES is empty
In the 3.10 kernel, dtb-y is not defined in Makefile.boot anymore but in dts/Makefile, so it needs to be included too. Change-Id: I6d6fccf933709bcb6220ce8f12b4b9e2a7c40d63 Signed-off-by: Benoit Goby <benoit@android.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 3310df3a0569..65285bbbf899 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -14,6 +14,7 @@
ifneq ($(MACHINE),)
include $(srctree)/$(MACHINE)/Makefile.boot
endif
+include $(srctree)/arch/arm/boot/dts/Makefile
# Note: the following conditions must always be true:
# ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)