From: Youngwan Kim <y103.kim@samsung.com>
Date: Thu, 12 Jul 2018 03:23:19 +0000 (+0900)
Subject: Android-P: Add DTBO build sequnce
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f573bcc7ab0d952444b045c7e5fec7ccc490a952;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Android-P: Add DTBO build sequnce

Change-Id: I5c73a923bea56269cae4d02e0a773ee087592d48
Signed-off-by: Youngwan Kim <y103.kim@samsung.com>
---

diff --git a/AndroidKernel.mk b/AndroidKernel.mk
index cc4fe65c5858..d211794b4a10 100644
--- a/AndroidKernel.mk
+++ b/AndroidKernel.mk
@@ -6,9 +6,7 @@ endif
 
 ifeq ($(INSTALLED_KERNEL_TARGET),)
 INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
-ifneq ($(BOARD_DTBO_SUPPORT),)
 INSTALLED_DTBO_TARGET := $(PRODUCT_OUT)/dtbo.img
-endif #BOARD_DTBO_SUPPORT
 INSTALLED_DTB_TARGET := $(PRODUCT_OUT)/dtb.img
 endif
 
@@ -38,10 +36,8 @@ KERNEL_CONFIG := $(TARGET_KERNEL_SOURCE)/.config
 KERNEL_BOOT := $(TARGET_KERNEL_SOURCE)/arch/$(KERNEL_ARCH)/boot
 KERNEL_BIN := $(KERNEL_BOOT)/Image
 KERNEL_DTB_DIR := $(KERNEL_BOOT)/dts/exynos
-KERNEL_DTB := $(KERNEL_DTB_DIR)/exynos9610-erd9610.dtb
-ifneq ($(BOARD_DTBO_SUPPORT),)
+KERNEL_DTB := $(KERNEL_DTB_DIR)/exynos9610.dtb
 KERNEL_DTBO_CFG := $(KERNEL_DTB_DIR)/exynos9610_dtboimg.cfg
-endif #BOARD_DTBO_SUPPORT
 MKDTIMG := $(HOST_OUT_EXECUTABLES)/mkdtimg
 
 ifeq ($(KERNEL_DEFCONFIG),)
@@ -79,7 +75,7 @@ $(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)
 
-ifneq ($(BOARD_DTBO_SUPPORT),)
+# mkdtimg cfg_create exynos9610_dtbo.img arch/arm64/boot/dts/exynos/exynos9610_dtboimg.cfg
 $(INSTALLED_KERNEL_TARGET): $(KERNEL_BIN) $(MKDTIMG)
 	cp $(KERNEL_BIN) $(INSTALLED_KERNEL_TARGET)
 	cp $(KERNEL_DTB) $(INSTALLED_DTB_TARGET)
@@ -87,11 +83,6 @@ $(INSTALLED_KERNEL_TARGET): $(KERNEL_BIN) $(MKDTIMG)
 	ln -sf $(TARGET_KERNEL_SOURCE)/arch
 	$(MKDTIMG) cfg_create $(INSTALLED_DTBO_TARGET) $(KERNEL_DTBO_CFG)
 	rm -f arch
-else #BOARD_DTBO_SUPPORT
-$(INSTALLED_KERNEL_TARGET): $(KERNEL_BIN) $(MKDTIMG)
-	cp $(KERNEL_BIN) $(INSTALLED_KERNEL_TARGET)
-	cp $(KERNEL_DTB) $(INSTALLED_DTB_TARGET)
-endif #BOARD_DTBO_SUPPORT
 
 endif #TARGET_PREBUILT_KERNEL
 endif #KERNEL_DEFCONFIG