From: Jan Altensen <info@stricted.net>
Date: Tue, 22 Jun 2021 17:39:20 +0000 (+0200)
Subject: g12: Support multiple dtbo's
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2d9f068f2f4cb2efd3751096e73991d57fe251d8;p=GitHub%2FLineageOS%2FG12%2Fandroid_device_amlogic_g12-common.git

g12: Support multiple dtbo's

Change-Id: I60092adb4e25d699115c0b6f5b3c1434300957e3
---

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 8e74eb7..4038ea6 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -48,6 +48,7 @@ BOARD_KERNEL_CMDLINE := androidboot.dynamic_partitions=true androidboot.dtbo_idx
 BOARD_KERNEL_IMAGE_NAME := Image.gz
 BOARD_KERNEL_OFFSET := 0x00008000
 BOARD_KERNEL_PAGESIZE := 2048
+BOARD_PREBUILT_DTBOIMAGE ?= $(TARGET_OUT_INTERMEDIATES)/DTBO_OBJ/arch/$(KERNEL_ARCH)/boot/dtbo.img
 BOARD_RAMDISK_OFFSET := 0xfef10000
 BOARD_SECOND_OFFSET := 0xfee10000
 BOARD_TAGS_OFFSET := 0xfdf10100
diff --git a/build/tasks/2ndbootloader.mk b/build/tasks/2ndbootloader.mk
index e36f76b..e67ea68 100644
--- a/build/tasks/2ndbootloader.mk
+++ b/build/tasks/2ndbootloader.mk
@@ -50,6 +50,12 @@ 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), \
+		$(DTBDIR)/$(strip $(dtbo)).dtb \
+	)
+endif
 
 endif