From b9906fe4f1720dbd4f3e6d4047b1a51bb96f5e38 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Wed, 21 Aug 2013 17:05:26 -0700 Subject: [PATCH] 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 --- generate_extra_images.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/generate_extra_images.mk b/generate_extra_images.mk index edaa8e1d..9cba87f1 100644 --- a/generate_extra_images.mk +++ b/generate_extra_images.mk @@ -84,9 +84,12 @@ DTBTOOL := $(HOST_OUT_EXECUTABLES)/dtbTool$(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