summaryrefslogtreecommitdiff
path: root/build/tasks/dtimage.mk
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-28 15:55:53 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-28 15:55:53 +0000
commitdf72c1bf92c01e9735c71794f34cc41fda0ef8b2 (patch)
tree90aacb633d142c11c6922b13965018a37799de0e /build/tasks/dtimage.mk
parent250ae957dccabc09e3e269c474dd2d84285f1a21 (diff)
parented84c02f8cffa49b95bbbc7eb5052dc5d3f4b933 (diff)
downloadhikey-df72c1bf92c01e9735c71794f34cc41fda0ef8b2.tar.gz
Snap for 8512216 from ed84c02f8cffa49b95bbbc7eb5052dc5d3f4b933 to tm-frc-media-releaset_frc_med_330443030android13-frc-media-release
Change-Id: I4827d965f910e0919ed5aa959ceca9323a7393d5
Diffstat (limited to 'build/tasks/dtimage.mk')
-rw-r--r--build/tasks/dtimage.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/build/tasks/dtimage.mk b/build/tasks/dtimage.mk
index 4d6a74d4..86cc290e 100644
--- a/build/tasks/dtimage.mk
+++ b/build/tasks/dtimage.mk
@@ -1,7 +1,11 @@
ifneq ($(filter hikey%, $(TARGET_DEVICE)),)
ifneq ($(TARGET_NO_DTIMAGE), true)
+# make sure the vendor package is present
-MKDTIMG := device/linaro/hikey/installer/hikey960/mkdtimg
+include device/linaro/hikey/vendor-package-ver.mk
+ifneq (,$(wildcard $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/version.mk))
+
+MKDTIMG := $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/bootloader/mkdtimg
DTB := $(PRODUCT_OUT)/hi3660-hikey960.dtb
$(PRODUCT_OUT)/dt.img: $(DTB)
@@ -15,3 +19,4 @@ BOARD_PACK_RADIOIMAGES += dt.img
endif
endif
+endif