Evolution-x-devices/kernel_oneplus_sm8550-devicetrees
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/kernel_oneplus_sm8550-devicetrees synced 2026-01-28 07:14:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

dt: Split DTBs based on kernel config

Browse Source 
This is a workaround for the DTB[O]s merging issue that arises when
adding all DTBs present in oplus dir. It could probably be solved with
additional logic in Qualcomm's merge_dtbs script, but let's just keep
it untouched.
This commit is contained in:
Bruno Martins
2023-09-15 15:24:31 +01:00
parent 4b203c3d59
commit c27438c276
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
oplus/Makefile
View File

@@ -1,13 +1,19 @@
KALAMA_BASE_DTB += ../qcom/kalama.dtb ../qcom/kalama-v2.dtb
KALAMA_APQ_BASE_DTB += ../qcom/kalamap.dtb ../qcom/kalamap-v2.dtb
ifeq ($(CONFIG_WUKONG_DTB),y)
OPLUS_KALAMA_BOARDS += \
wukong-21131-kalama-overlay.dtbo \
wukong-21131-kalama-overlay-EVB.dtbo \
wukong-21131-kalama-overlay-EVB.dtbo
else ifeq ($(CONFIG_SALAMI_DTB),y)
OPLUS_KALAMA_BOARDS += \
salami-22811-kalama-overlay.dtbo \
salami-22811-kalama-overlay-EVB.dtbo \
salami-22811-kalama-overlay-T0.dtbo \
salami-22811-kalama-overlay-T0.dtbo
else ifeq ($(CONFIG_XUEYING_DTB),y)
OPLUS_KALAMA_BOARDS += \
xueying-22003-kalama-overlay.dtbo
endif
kalama-overlays-dtb-y += $(OPLUS_KALAMA_BOARDS) $(KALAMA_BASE_DTB) $(KALAMA_APQ_BASE_DTB)
dtb-y += $(OPLUS_KALAMA_BOARDS) $(KALAMA_BASE_DTB) $(KALAMA_APQ_BASE_DTB)

6
qcom/audio/Kbuild
View File

@@ -17,9 +17,9 @@ dtbo-y += \
kalama-sg-audio-hhg.dtbo
endif
#OPLUS_DTS_OVERLAY start
dtbo-y += oplus/wukong-21131-audio-kalama-overlay.dtbo
dtbo-y += oplus/salami-22811-audio-kalama-overlay.dtbo
dtbo-y += oplus/xueying-22003-audio-kalama-overlay.dtbo
dtbo-$(CONFIG_WUKONG_DTB) += oplus/wukong-21131-audio-kalama-overlay.dtbo
dtbo-$(CONFIG_SALAMI_DTB) += oplus/salami-22811-audio-kalama-overlay.dtbo
dtbo-$(CONFIG_XUEYING_DTB) += oplus/xueying-22003-audio-kalama-overlay.dtbo
#OPLUS_DTS_OVERLAY end
endif

6
qcom/camera/config/kalama.mk
View File

@@ -10,7 +10,7 @@ dtbo-$(CONFIG_ARCH_KALAMA) += kalama-camera-sensor-cdp.dtbo \
endif
#OPLUS_DTS_OVERLAY start
dtbo-$(CONFIG_ARCH_KALAMA) += oplus/wukong-camera-overlay.dtbo
dtbo-$(CONFIG_ARCH_KALAMA) += oplus/salami-camera-overlay.dtbo
dtbo-$(CONFIG_ARCH_KALAMA) += oplus/xueying-camera-overlay.dtbo
dtbo-$(CONFIG_WUKONG_DTB) += oplus/wukong-camera-overlay.dtbo
dtbo-$(CONFIG_SALAMI_DTB) += oplus/salami-camera-overlay.dtbo
dtbo-$(CONFIG_XUEYING_DTB) += oplus/xueying-camera-overlay.dtbo
#OPLUS_DTS_OVERLAY end

6
qcom/display/Kbuild
View File

@@ -15,9 +15,9 @@ dtbo-$(CONFIG_ARCH_KALAMA) += \
display/kalama-sde-display-atp-overlay.dtbo
endif
#OPLUS_DTS_OVERLAY start
dtbo-$(CONFIG_ARCH_KALAMA) += oplus/wukong-21131-display-kalama-overlay.dtbo
dtbo-$(CONFIG_ARCH_KALAMA) += oplus/salami-22811-display-kalama-overlay.dtbo
dtbo-$(CONFIG_ARCH_KALAMA) += oplus/xueying-22003-display-kalama-overlay.dtbo
dtbo-$(CONFIG_WUKONG_DTB) += oplus/wukong-21131-display-kalama-overlay.dtbo
dtbo-$(CONFIG_SALAMI_DTB) += oplus/salami-22811-display-kalama-overlay.dtbo
dtbo-$(CONFIG_XUEYING_DTB) += oplus/xueying-22003-display-kalama-overlay.dtbo
#OPLUS_DTS_OVERLAY end
else
dtbo-$(CONFIG_ARCH_KALAMA) += display/trustedvm-kalama-sde-display-mtp-overlay.dtbo \