kernel: use dtc from prebuilt
dtc from OUT_DIR might not be available, so use the prebuilt one instead.
Also, clean-up a little bit and follow the same logic as prebuilt make binary.
Change-Id: I4dbf6233db98d5528f0d3890141e46d7a6d8e1c3
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index ba70f29..9128f6c 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -200,7 +200,7 @@
# $(1): output path (The value passed to O=)
# $(2): target to build (eg. defconfig, modules, dtbo.img)
define internal-make-kernel-target
-$(PATH_OVERRIDE) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_BUILD_OUT_PREFIX)$(1) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(2)
+$(PATH_OVERRIDE) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_BUILD_OUT_PREFIX)$(1) DTC=$(KERNEL_DTC_CMD) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(2)
endef
# Make a kernel target
diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
index 105fe6b..4fdb741 100644
--- a/config/BoardConfigKernel.mk
+++ b/config/BoardConfigKernel.mk
@@ -141,6 +141,9 @@
BOARD_PREBUILT_DTBOIMAGE ?= $(PRODUCT_OUT)/dtbo-pre.img
endif
+# Set use the full path to the dtc command
+KERNEL_DTC_CMD := $(BUILD_TOP)/prebuilts/tools-bliss/$(HOST_OS)-x86/bin/dtc
+
# Set use the full path to the make command
KERNEL_MAKE_CMD := $(BUILD_TOP)/prebuilts/build-tools/$(HOST_OS)-x86/bin/make
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 8f3b724..7eba1b6 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -5,6 +5,7 @@
KERNEL_ARCH \
KERNEL_BUILD_OUT_PREFIX \
KERNEL_CROSS_COMPILE \
+ KERNEL_DTC_CMD \
KERNEL_MAKE_CMD \
KERNEL_MAKE_FLAGS \
PATH_OVERRIDE_SOONG \