diff options
| author | Scott Mertz <scott@cyngn.com> | 2015-08-26 19:08:03 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-12-11 09:18:53 -0800 |
| commit | de05e821a5db235f4bf1c6e9fc1ab05799c3d183 (patch) | |
| tree | 2017d03fca0097db3ef80a9d5ba7d43e43c844c3 /core | |
| parent | 820e564ab54562c5809f0deaf81ab4fee6a1a33a (diff) | |
| download | build-de05e821a5db235f4bf1c6e9fc1ab05799c3d183.zip build-de05e821a5db235f4bf1c6e9fc1ab05799c3d183.tar.gz build-de05e821a5db235f4bf1c6e9fc1ab05799c3d183.tar.bz2 | |
build: only specify least specific directory to dtbtool
New kernels (3.18) place dtb files into the qcom subdirectory,
but older kernels simply create a qcom subdirectory and place
the dtb files at the same level in the heirarchy. Rather than
looking for the first directory that exists, dtbtool has been
modified to search all subdirectories for dtb files, and
therefore we have to remove the specific subdirectories.
Change-Id: I82e948c0a20605f051a60fdfaae9679e1fa6555e
Diffstat (limited to 'core')
| -rw-r--r-- | core/tasks/dt_image.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/tasks/dt_image.mk b/core/tasks/dt_image.mk index 86c36fb..3328e56 100644 --- a/core/tasks/dt_image.mk +++ b/core/tasks/dt_image.mk @@ -18,7 +18,8 @@ DTBTOOL := $(HOST_OUT_EXECUTABLES)/$(DTBTOOL_NAME)$(HOST_EXECUTABLE_SUFFIX) INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img -possible_dtb_dirs = $(KERNEL_OUT)/arch/$(TARGET_KERNEL_ARCH)/boot/dts/ $(KERNEL_OUT)/arch/arm/boot/ +# Most specific paths must come first in possible_dtb_dirs +possible_dtb_dirs = $(KERNEL_OUT)/arch/$(TARGET_KERNEL_ARCH)/boot/ dtb_dir = $(firstword $(wildcard $(possible_dtb_dirs))) define build-dtimage-target |