From 493febf7fb0c513702de89c26935783cb725642e Mon Sep 17 00:00:00 2001
From: Rahul Shahare <rshaha@codeaurora.org>
Date: Fri, 5 Jul 2019 18:43:30 +0530
Subject: [PATCH] AndroidKernel: Building dtb.img to support header version 2

The dtb.img is made by concatenating all the compiled dtbs
after the kernel is compiled. This dtb.img is then added to be
a part of the boot.img.

Change-Id: I9684126c312e3f5988b1eaa298b37037a11fe747
Signed-off-by: Rahul Shahare <rshaha@codeaurora.org>
---
 AndroidKernel.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/AndroidKernel.mk b/AndroidKernel.mk
index 55671d14ec26..c7d3c22fa269 100644
--- a/AndroidKernel.mk
+++ b/AndroidKernel.mk
@@ -95,8 +95,15 @@ endif
 ifeq ($(TARGET_KERNEL_APPEND_DTB), true)
 $(info Using appended DTB)
 TARGET_PREBUILT_INT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)-dtb
+else
+$(info Using DTB Image)
+INSTALLED_DTBIMAGE_TARGET := $(PRODUCT_OUT)/dtb.img
 endif
 
+# Creating a dtb.img once the kernel is compiled if TARGET_KERNEL_APPEND_DTB is set to be false
+$(INSTALLED_DTBIMAGE_TARGET): $(INSTALLED_KERNEL_TARGET)
+	cat $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/qcom/*.dtb > $@
+
 KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr
 KERNEL_MODULES_INSTALL ?= system
 KERNEL_MODULES_OUT ?= $(PRODUCT_OUT)/$(KERNEL_MODULES_INSTALL)/lib/modules