From edcb7169b399bdd290800157c8e35535cac5c971 Mon Sep 17 00:00:00 2001
From: Bal?zs Triszka <info@balika011.hu>
Date: Tue, 31 Mar 2026 03:22:30 +0000
Subject: [PATCH] merge_dtbs: Add support for TARGET_MERGE_DTBOS_WILDCARD

Change-Id: I91bef798e9cd54f5de23e3e344ebcdbf93ec96dd
---

diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 179a454..acf9a18 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -76,6 +76,9 @@
 #   TARGET_DTB_LIST_WILDCARD           = Optional, limits the .dtb files used to generate the
 #                                          final DTB image when NOT using QCOM's merge_dtbs
 #                                          script. Allows multiple patterns.
+#
+#   TARGET_MERGE_DTBOS_WILDCARD        = Optional, limits the .dtbo files used to generate the
+#                                          final DTBO image when using QCOM's merge_dtbs script.
 
 ifneq ($(TARGET_NO_KERNEL),true)
 ifneq ($(TARGET_NO_KERNEL_OVERRIDE),true)
@@ -92,6 +95,8 @@
 # dtb generation - optional
 TARGET_MERGE_DTBS_WILDCARD ?= *
 TARGET_DTB_LIST_WILDCARD ?= *
+# dtbo generation - optional
+TARGET_MERGE_DTBOS_WILDCARD ?= *
 # recovery modules.load fallback - optional
 BOARD_RECOVERY_KERNEL_MODULES_LOAD ?= $(BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD)
 
@@ -554,7 +559,7 @@
 $(BOARD_PREBUILT_DTBOIMAGE):
 	@echo "Building dtbo.img"
 ifeq ($(BOARD_USES_QCOM_MERGE_DTBS_SCRIPT),true)
-	$(MKDTBOIMG) create $@ --page_size=$(BOARD_KERNEL_PAGESIZE) $(shell find $(DTBS_OUT) -type f -name "*.dtbo" | sort)
+	$(MKDTBOIMG) create $@ --page_size=$(BOARD_KERNEL_PAGESIZE) $(shell find $(DTBS_OUT) -type f -name "${TARGET_MERGE_DTBOS_WILDCARD}.dtbo" | sort)
 else
 	$(hide) find $(DTBO_OUT)/arch/$(KERNEL_ARCH)/boot/dts -type f -name "*.dtbo" | xargs rm -f
 	$(call make-dtbo-target,$(KERNEL_DEFCONFIG))