diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-08-21 17:05:26 -0700 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-10-27 00:45:16 +0200 |
commit | 5960a842ef1b4fe16223aa9721a6a527da7a235f (patch) | |
tree | 9df2fc7a1d6e4b3d3c1353b15f4ac8c88ba81e7e /core/generate_extra_images.mk | |
parent | 163381a3fb4d1f6ab38b30749a10608c34f7072e (diff) | |
download | build-5960a842ef1b4fe16223aa9721a6a527da7a235f.zip build-5960a842ef1b4fe16223aa9721a6a527da7a235f.tar.gz build-5960a842ef1b4fe16223aa9721a6a527da7a235f.tar.bz2 |
generate_extra_images: Look for 3.10 dtbs
The dtbs have changed location between 3.4 and 3.10. Look for the
new location first and fallback to the 3.4 location if they're
missing.
Change-Id: I7aada8dbcf01ea6f62b3235b452c9329cd69e5e8
Diffstat (limited to 'core/generate_extra_images.mk')
-rw-r--r-- | core/generate_extra_images.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/generate_extra_images.mk b/core/generate_extra_images.mk index c253668..9c41028 100644 --- a/core/generate_extra_images.mk +++ b/core/generate_extra_images.mk @@ -99,9 +99,12 @@ DTBTOOL := $(HOST_OUT_EXECUTABLES)/$(DTBTOOL_NAME)$(HOST_EXECUTABLE_SUFFIX) INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img +possible_dtb_dirs = $(KERNEL_OUT)/arch/arm/boot/dts/ $(KERNEL_OUT)/arch/arm/boot/ +dtb_dir = $(firstword $(wildcard $(possible_dtb_dirs))) + define build-dtimage-target $(call pretty,"Target dt image: $(INSTALLED_DTIMAGE_TARGET)") - $(hide) $(DTBTOOL) -o $@ -s $(BOARD_KERNEL_PAGESIZE) -p $(KERNEL_OUT)/scripts/dtc/ $(KERNEL_OUT)/arch/arm/boot/ + $(hide) $(DTBTOOL) -o $@ -s $(BOARD_KERNEL_PAGESIZE) -p $(KERNEL_OUT)/scripts/dtc/ $(dtb_dir) $(hide) chmod a+r $@ endef |