commit 2c247d80d0d934b7ad8bad0aca5b3d305b422582
author Rashed Abdel-Tawab <rashed@linux.com> Fri Sep 27 23:37:14 2019 -0400
committer Rashed Abdel-Tawab <rashedabdeltawab@gmail.com> Sat Oct 05 05:32:14 2019 +0200
tree 177469782d3ee6404369eaf1f623b76783f98980
parent 6f3ded864f3e79a826dfdb71c1053e80556b6643

kernel: Build dtb.img from compiled dtbs

Change-Id: If419d090740c005357fbd1665f78296d106b4509

build/tasks/kernel.mk

diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 0fdbba3..a654bea 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -214,6 +214,12 @@
 $(call internal-make-kernel-target,$(PRODUCT_OUT)/dtbo,$(1))
 endef
 
+# Make a DTB targets
+# $(1): The DTB target to build (eg. dtbs, defconfig)
+define make-dtb-target
+$(call internal-make-kernel-target,$(PRODUCT_OUT)/dtbs,$(1))
+endef
+
 $(KERNEL_OUT):
 	mkdir -p $(KERNEL_OUT)
 
@@ -298,4 +304,13 @@
 .PHONY: dtboimage
 dtboimage: $(INSTALLED_DTBOIMAGE_TARGET)
 
+ifeq ($(BOARD_INCLUDE_DTB_IN_BOOTIMG),true)
+$(BOARD_PREBUILT_DTBIMAGE_DIR):
+	echo -e ${CL_GRN}"Building DTBs"${CL_RST}
+	$(call make-dtb-target,$(KERNEL_DEFCONFIG))
+	$(call make-dtb-target,dtbs)
+.PHONY: dtbimage
+dtbimage: $(INSTALLED_DTBIMAGE_TARGET)
+endif # BOARD_INCLUDE_DTB_IN_BOOTIMG
+
 endif # TARGET_NO_KERNEL