From 66affe08c72b1dee6caee86521a69d52db5b9d4a Mon Sep 17 00:00:00 2001
From: Jan Altensen <info@stricted.net>
Date: Thu, 24 Jun 2021 19:50:02 +0200
Subject: [PATCH] g12: Fix dtbo image creation

Change-Id: I30ea3685d70632a55dce49120fd20f14a9b61e87
---
 build/tasks/2ndbootloader.mk | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build/tasks/2ndbootloader.mk b/build/tasks/2ndbootloader.mk
index e67ea68..7600d76 100644
--- a/build/tasks/2ndbootloader.mk
+++ b/build/tasks/2ndbootloader.mk
@@ -23,7 +23,7 @@ DTBTMP := $(PRODUCT_OUT)/tmp_dt
 DTBDIR := $(PRODUCT_OUT)/obj/KERNEL_OBJ/arch/arm64/boot/dts/amlogic
 DTCDIR := $(PRODUCT_OUT)/obj/KERNEL_OBJ/scripts/dtc/
 
-TARGET_DTBO_NAME ?= amlogicandroid_p_overlay_dt
+TARGET_DTBO_NAME ?= android_p_overlay_dt
 
 define aml-compress-dtb
 	if [ -n "$(shell find $(1) -size +200k)" ]; then \
@@ -50,12 +50,11 @@ else
 endif
 
 $(BOARD_PREBUILT_DTBOIMAGE): $(INSTALLED_KERNEL_TARGET) $(MKDTBOIMG)
-ifeq ($(words $(TARGET_DTB_NAME)),1)
-	$(MKDTBOIMG) create $@ $(DTBDIR)/$(TARGET_DTBO_NAME).dtb
-else
-	$(MKDTBOIMG) create $@ $(foreach dtbo, $(TARGET_DTB_NAME), \
+	$(MKDTBOIMG) create $@ $(foreach dtbo, $(TARGET_DTBO_NAME), \
 		$(DTBDIR)/$(strip $(dtbo)).dtb \
 	)
-endif
+
+.PHONY: dtbotest
+dtbotest: $(BOARD_PREBUILT_DTBOIMAGE)
 
 endif
-- 
2.20.1