Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f9989dd authored by Stephen Boyd's avatar Stephen Boyd Committed by Michael Bestas
Browse files

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
parent f828f559

core/generate_extra_images.mk

+4 −1
Original line number Diff line number Diff line
@@ -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