From 5e65f8b9547a00b3b44d0f29de7111fb069f2a94 Mon Sep 17 00:00:00 2001 From: Youngwan Kim Date: Thu, 31 May 2018 11:23:40 +0900 Subject: [PATCH] Android-P: Add DTBOIMAGE to android build system Change-Id: I09b20cda5d03f02d5f80b505e8d1b27dac68c6e4 Signed-off-by: Youngwan Kim --- AndroidKernel.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/AndroidKernel.mk b/AndroidKernel.mk index d211794b4a10..3edd76c91eeb 100644 --- a/AndroidKernel.mk +++ b/AndroidKernel.mk @@ -6,7 +6,8 @@ endif ifeq ($(INSTALLED_KERNEL_TARGET),) INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel -INSTALLED_DTBO_TARGET := $(PRODUCT_OUT)/dtbo.img +INSTALLED_DTBOIMAGE_TARGET := $(PRODUCT_OUT)/dtbo.img +BOARD_PREBUILT_DTBOIMAGE := $(PRODUCT_OUT)/dtbo.img INSTALLED_DTB_TARGET := $(PRODUCT_OUT)/dtb.img endif @@ -57,7 +58,7 @@ remove-bin: rm -f $(KERNEL_BIN) rm -f $(KERNEL_DTB) rm -f $(INSTALLED_KERNEL_TARGET) - rm -f $(INSTALLED_DTBO_TARGET) + rm -f $(INSTALLED_DTBOIMAGE_TARGET) rm -f $(INSTALLED_DTB_TARGET) .PHONY: kernel @@ -79,9 +80,9 @@ $(KERNEL_BIN): $(KERNEL_CONFIG) $(INSTALLED_KERNEL_TARGET): $(KERNEL_BIN) $(MKDTIMG) cp $(KERNEL_BIN) $(INSTALLED_KERNEL_TARGET) cp $(KERNEL_DTB) $(INSTALLED_DTB_TARGET) - $(hide) echo "Building DTBO..." + $(hide) echo "Building DTBOIMAGE..." ln -sf $(TARGET_KERNEL_SOURCE)/arch - $(MKDTIMG) cfg_create $(INSTALLED_DTBO_TARGET) $(KERNEL_DTBO_CFG) + $(MKDTIMG) cfg_create $(INSTALLED_DTBOIMAGE_TARGET) $(KERNEL_DTBO_CFG) rm -f arch endif #TARGET_PREBUILT_KERNEL -- 2.20.1