From 34dad32744324e5ce92bc87c43e25723feb518e8 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 14 Sep 2023 18:21:31 +0100 Subject: [PATCH] kernel: Include DTBOs from OEM/ODM folder in base DTB It can be the case where OEM/ODM decided to put the main DTBOs outside vendor/qcom (e.g. vendor/oplus). Support such usecase by generically allowing all .dtbo files found in all first-level subdirs to be moved to base DTB folder. Change-Id: I154d401b560535d1fa8cd7ed4965dd34a4cf75f2 --- build/tasks/kernel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk index 971e44aeb..58b15573a 100644 --- a/build/tasks/kernel.mk +++ b/build/tasks/kernel.mk @@ -575,8 +575,8 @@ else ifeq ($(BOARD_USES_QCOM_MERGE_DTBS_SCRIPT),true) $(hide) find $(DTBS_BASE) -type f -name "*.dtb*" | xargs rm -f $(hide) find $(DTBS_OUT) -type f -name "*.dtb*" | xargs rm -f - mv $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom/*.dtb $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom/*.dtbo $(DTBS_BASE)/ - PATH=$(abspath $(HOST_OUT_EXECUTABLES)):$${PATH} python3 $(BUILD_TOP)/vendor/lineage/build/tools/merge_dtbs.py $(DTBS_BASE) $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom $(DTBS_OUT) + mv $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom/*.dtb $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/*/*.dtbo $(DTBS_BASE)/ + PATH=$(abspath $(HOST_OUT_EXECUTABLES)):$${PATH} python3 $(BUILD_TOP)/vendor/aosp/build/tools/merge_dtbs.py $(DTBS_BASE) $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom $(DTBS_OUT) cat $(shell find $(DTB_OUT)/out -type f -name "*.dtb" | sort) > $@ else cat $(shell find $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts -type f -name "*.dtb" | sort) > $@