From 48b1217f73810926f3850592f9e8275f623c0141 Mon Sep 17 00:00:00 2001 From: "Taein, An" Date: Tue, 19 Jun 2018 17:04:11 +0900 Subject: [PATCH] Android-P: Change the build rule of dtbo image Change-Id: Iea712679a44df21f10377c8fc192675e9104f60e Signed-off-by: Taein, An --- AndroidKernel.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/AndroidKernel.mk b/AndroidKernel.mk index 0a13a1f4c24a..e9d5134d6fce 100644 --- a/AndroidKernel.mk +++ b/AndroidKernel.mk @@ -7,7 +7,7 @@ endif ifeq ($(INSTALLED_KERNEL_TARGET),) INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel INSTALLED_DTBOIMAGE_TARGET := $(PRODUCT_OUT)/dtbo.img -BOARD_PREBUILT_DTBOIMAGE := $(PRODUCT_OUT)/dtbo.img +BOARD_PREBUILT_DTBOIMAGE := $(PRODUCT_OUT)/prebuilt_dtbo.img INSTALLED_DTB_TARGET := $(PRODUCT_OUT)/dtb.img BOARD_MKBOOTIMG_ARGS += \ --second $(INSTALLED_DTB_TARGET) \ @@ -79,13 +79,14 @@ $(KERNEL_BIN): $(KERNEL_CONFIG) $(hide) echo "Building kernel..." $(MAKE) -C $(TARGET_KERNEL_SOURCE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) CLANG_TRIPLE=$(CLANG_TRIPLE) CC=clang -j$(N_KERNEL_BUILD_THREAD) -# mkdtimg cfg_create exynos9610_dtbo.img arch/arm64/boot/dts/exynos/exynos9610_dtboimg.cfg -$(INSTALLED_KERNEL_TARGET): $(KERNEL_BIN) $(MKDTIMG) +$(INSTALLED_KERNEL_TARGET): $(INSTALLED_DTBOIMAGE_TARGET) cp $(KERNEL_BIN) $(INSTALLED_KERNEL_TARGET) cp $(KERNEL_DTB) $(INSTALLED_DTB_TARGET) + +$(BOARD_PREBUILT_DTBOIMAGE): $(MKDTIMG) $(KERNEL_DTBO_CFG) $(KERNEL_BIN) $(hide) echo "Building DTBOIMAGE..." ln -sf $(TARGET_KERNEL_SOURCE)/arch - $(MKDTIMG) cfg_create $(INSTALLED_DTBOIMAGE_TARGET) $(KERNEL_DTBO_CFG) + $(MKDTIMG) cfg_create $@ $(KERNEL_DTBO_CFG) rm -f arch endif #TARGET_PREBUILT_KERNEL -- 2.20.1