From 99570abad66e94a4eaf9ce2d940937a018ffa977 Mon Sep 17 00:00:00 2001 From: Prakruthi Deepak Heragu Date: Wed, 19 Jun 2019 11:50:09 -0700 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: I7667d1c3118962bbc709a362a2b9a2b6419dede4 Signed-off-by: Prakruthi Deepak Heragu --- AndroidKernel.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/AndroidKernel.mk b/AndroidKernel.mk index 74f1b0d7761b..3ab1fd88071e 100644 --- a/AndroidKernel.mk +++ b/AndroidKernel.mk @@ -6,6 +6,11 @@ ifeq ($(KERNEL_TARGET),) INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel endif +ifneq ($(TARGET_KERNEL_APPEND_DTB), true) +$(info Using DTB Image) +INSTALLED_DTBIMAGE_TARGET := $(PRODUCT_OUT)/dtb.img +endif + TARGET_KERNEL_MAKE_ENV := $(strip $(TARGET_KERNEL_MAKE_ENV)) ifeq ($(TARGET_KERNEL_MAKE_ENV),) KERNEL_MAKE_ENV := @@ -184,6 +189,10 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \ $(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) oldconfig; fi +# Creating a dtb.img once the kernel is compiled if TARGET_KERNEL_APPEND_DTB is set to be false +$(INSTALLED_DTBIMAGE_TARGET): $(TARGET_PREBUILT_INT_KERNEL) + cat $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom/*.dtb > $@ + .PHONY: kerneltags kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG) $(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) tags