From fd0ed52eadb88aacf01263a0623cf91cd366fd18 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 15 Mar 2025 15:13:09 +0530 Subject: [PATCH] dt: Opt-out for irrelevant DTB[O]s based on config Change-Id: If2421afc876e320489d1e457b8ab91176e5f7b48 Signed-off-by: chandu078 --- Makefile | 4 +-- qcom/Makefile | 4 +++ qcom/audio/Kbuild | 55 +++++++++++++++++---------------- qcom/camera/config/pineapple.mk | 22 +++++++------ qcom/display/Kbuild | 45 ++++++++++++++++----------- 5 files changed, 74 insertions(+), 56 deletions(-) diff --git a/Makefile b/Makefile index 17ab318f..aa507634 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ vendor := $(srctree)/$(src) ifneq "$(wildcard $(vendor)/qcom)" "" -#OPLUS_DTS_OVERLAY start - #subdir-y += qcom -#OPLUS_DTS_OVERLAY end + subdir-y += qcom endif #OPLUS_DTS_OVERLAY start subdir-y += oplus diff --git a/qcom/Makefile b/qcom/Makefile index 67d57d9d..310d6618 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -11,6 +11,8 @@ add-overlays = $(foreach o,$1,$(foreach b,$2,$(eval $(basename $b)-$(basename $o # see DTB_TYPES from scripts/Makefile.dtbinst and install_dtbs from build.config.msm.common # +ifneq ($(CONFIG_OPLUS_DEVICE_DTBS), y) + ifneq ($(CONFIG_ARCH_QTI_VM), y) PINEAPPLE_BASE_DTB += pineapple-v2.dtb pineapple-qcm.dtb @@ -685,6 +687,8 @@ sdmsteppeauto-overlays-dtb-$(CONFIG_ARCH_SA6155) += $(SA6155_BOARDS) $(SA6155P_B dtb-y += $(sdmsteppeauto-dtb-y) +endif + always-y := $(dtb-y) subdir-y := $(dts-dirs) subdir-y += audio bt camera data display dsp eSE eva fingerprint graphics mm mmrm mm-sys nfc synx video wlan diff --git a/qcom/audio/Kbuild b/qcom/audio/Kbuild index a325a08f..611a856e 100644 --- a/qcom/audio/Kbuild +++ b/qcom/audio/Kbuild @@ -17,32 +17,35 @@ endif ifeq ($(CONFIG_ARCH_PINEAPPLE), y) dtbo-y += pineapple-audio.dtbo \ -# pineapple-audio-cdp.dtbo \ -# pineapple-audio-wsa883x-cdp.dtbo \ -# pineapple-audio-cdp-nfc.dtbo \ -# pineapple-audio-mtp.dtbo \ -# pineapple-audio-mtp-nfc.dtbo \ -# pineapple-audio-qrd.dtbo \ -# pineapple-audio-atp.dtbo \ -# pineapple-audio-rumi.dtbo \ -# pineapple-audio-rcm.dtbo \ -# pineapple-audio-qrd-sku2.dtbo \ -# pineapplep-audio-hdk.dtbo \ -# pineapplep-audio-aim500.dtbo \ -# pineapplep-audio-aim500-v2.dtbo \ -# cliffs-audio.dtbo \ -# cliffs-audio-mtp.dtbo \ -# cliffs7-audio-mtp.dtbo \ -# cliffs-audio-qrd.dtbo \ -# cliffs7-audio-qrd.dtbo \ -# cliffs-audio-cdp.dtbo \ -# cliffs7-audio-cdp.dtbo \ -# cliffs-audio-rcm.dtbo \ -# cliffs7-audio-rcm.dtbo \ -# cliffs-audio-mtp-wcd9395.dtbo \ -# cliffs7-audio-mtp-wcd9395.dtbo \ -# cliffs-audio-atp.dtbo \ -# cliffs7-audio-atp.dtbo + cliffs-audio.dtbo +ifneq ($(CONFIG_OPLUS_DEVICE_DTBS), y) +dtbo-y += \ + pineapple-audio-cdp.dtbo \ + pineapple-audio-wsa883x-cdp.dtbo \ + pineapple-audio-cdp-nfc.dtbo \ + pineapple-audio-mtp.dtbo \ + pineapple-audio-mtp-nfc.dtbo \ + pineapple-audio-qrd.dtbo \ + pineapple-audio-atp.dtbo \ + pineapple-audio-rumi.dtbo \ + pineapple-audio-rcm.dtbo \ + pineapple-audio-qrd-sku2.dtbo \ + pineapplep-audio-hdk.dtbo \ + pineapplep-audio-aim500.dtbo \ + pineapplep-audio-aim500-v2.dtbo \ + cliffs-audio-mtp.dtbo \ + cliffs7-audio-mtp.dtbo \ + cliffs-audio-qrd.dtbo \ + cliffs7-audio-qrd.dtbo \ + cliffs-audio-cdp.dtbo \ + cliffs7-audio-cdp.dtbo \ + cliffs-audio-rcm.dtbo \ + cliffs7-audio-rcm.dtbo \ + cliffs-audio-mtp-wcd9395.dtbo \ + cliffs7-audio-mtp-wcd9395.dtbo \ + cliffs-audio-atp.dtbo \ + cliffs7-audio-atp.dtbo +endif #OPLUS_DTS_OVERLAY start dtbo-y += oplus/waffle-22825-audio-pineapple-overlay.dtbo dtbo-y += oplus/audi-23803-audio-cliffs-overlay.dtbo diff --git a/qcom/camera/config/pineapple.mk b/qcom/camera/config/pineapple.mk index 7a9f88da..ec60b8fd 100644 --- a/qcom/camera/config/pineapple.mk +++ b/qcom/camera/config/pineapple.mk @@ -1,10 +1,12 @@ dtbo-$(CONFIG_ARCH_PINEAPPLE) := pineapple-camera.dtbo -#dtbo-$(CONFIG_ARCH_PINEAPPLE) += pineapple-camera-v2.dtbo \ -# pineapple-camera-sensor-cdp.dtbo \ -# pineapple-camera-sensor-mtp.dtbo \ -# pineapple-camera-sensor-hdk.dtbo \ -# pineapple-camera-sensor-qrd.dtbo \ -# pineapple-camera-sensor-aim500.dtbo +ifneq ($(CONFIG_OPLUS_DEVICE_DTBS), y) +dtbo-$(CONFIG_ARCH_PINEAPPLE) += pineapple-camera-v2.dtbo \ + pineapple-camera-sensor-cdp.dtbo \ + pineapple-camera-sensor-mtp.dtbo \ + pineapple-camera-sensor-hdk.dtbo \ + pineapple-camera-sensor-qrd.dtbo \ + pineapple-camera-sensor-aim500.dtbo +endif #OPLUS_DTS_OVERLAY start dtbo-$(CONFIG_ARCH_PINEAPPLE) += oplus/waffle-camera-overlay.dtbo \ @@ -26,9 +28,11 @@ dtbo-$(CONFIG_ARCH_CLIFFS) += oplus/audi-camera-overlay.dtbo \ dtbo-$(CONFIG_ARCH_CLIFFS) += oplus/avalon-camera-overlay.dtbo \ #OPLUS_DTS_OVERLAY end -#dtbo-$(CONFIG_ARCH_CLIFFS) += cliffs-camera-sensor-cdp.dtbo \ -# cliffs-camera-sensor-mtp.dtbo \ -# cliffs-camera-sensor-qrd.dtbo +ifneq ($(CONFIG_OPLUS_DEVICE_DTBS), y) +dtbo-$(CONFIG_ARCH_CLIFFS) += cliffs-camera-sensor-cdp.dtbo \ + cliffs-camera-sensor-mtp.dtbo \ + cliffs-camera-sensor-qrd.dtbo +endif dtbo-$(CONFIG_ARCH_VOLCANO) += volcano-camera.dtbo dtbo-$(CONFIG_ARCH_VOLCANO) += volcano-camera-fp1-fp2.dtbo dtbo-$(CONFIG_ARCH_VOLCANO) += volcano-camera-qrd.dtbo diff --git a/qcom/display/Kbuild b/qcom/display/Kbuild index 48f75831..3414f7fb 100644 --- a/qcom/display/Kbuild +++ b/qcom/display/Kbuild @@ -7,16 +7,19 @@ endif ifneq ($(CONFIG_ARCH_QTI_VM), y) dtbo-$(CONFIG_ARCH_PINEAPPLE) += display/pineapple-sde.dtbo -# display/pineapple-sde-display-rumi-overlay.dtbo \ -# display/pineapple-sde-display-cdp-overlay.dtbo \ -# display/pineapple-sde-display-rcm-overlay.dtbo \ -# display/pineapple-sde-display-mtp-overlay.dtbo \ -# display/pineapple-sde-display-qrd-overlay.dtbo \ -# display/pineapple-sde-display-hdk-overlay.dtbo \ -# display/pineapple-sde-display-aim500-overlay.dtbo \ -# display/pineapple-sde-display-cdp-nfc-overlay.dtbo \ -# display/pineapple-sde-display-mtp-nfc-overlay.dtbo \ -# display/pineapple-sde-display-atp-overlay.dtbo +ifneq ($(CONFIG_OPLUS_DEVICE_DTBS), y) +dtbo-$(CONFIG_ARCH_PINEAPPLE) += \ + display/pineapple-sde-display-rumi-overlay.dtbo \ + display/pineapple-sde-display-cdp-overlay.dtbo \ + display/pineapple-sde-display-rcm-overlay.dtbo \ + display/pineapple-sde-display-mtp-overlay.dtbo \ + display/pineapple-sde-display-qrd-overlay.dtbo \ + display/pineapple-sde-display-hdk-overlay.dtbo \ + display/pineapple-sde-display-aim500-overlay.dtbo \ + display/pineapple-sde-display-cdp-nfc-overlay.dtbo \ + display/pineapple-sde-display-mtp-nfc-overlay.dtbo \ + display/pineapple-sde-display-atp-overlay.dtbo +endif else dtbo-$(CONFIG_ARCH_PINEAPPLE) += display/trustedvm-pineapple-sde-display-mtp-overlay.dtbo \ display/trustedvm-pineapple-sde-display-cdp-overlay.dtbo \ @@ -59,13 +62,16 @@ endif ifneq ($(CONFIG_ARCH_QTI_VM), y) dtbo-$(CONFIG_ARCH_CLIFFS) += display/cliffs-sde.dtbo -# display/cliffs-sde-display-rumi-overlay.dtbo \ -# display/cliffs-sde-display-cdp-overlay.dtbo \ -# display/cliffs-sde-display-rcm-overlay.dtbo \ -# display/cliffs-sde-display-mtp-overlay.dtbo \ -# display/cliffs-sde-display-mtp-wcd9395-overlay.dtbo \ -# display/cliffs-sde-display-qrd-overlay.dtbo \ -# display/cliffs-sde-display-atp-overlay.dtbo +ifneq ($(CONFIG_OPLUS_DEVICE_DTBS), y) +dtbo-$(CONFIG_ARCH_CLIFFS) += \ + display/cliffs-sde-display-rumi-overlay.dtbo \ + display/cliffs-sde-display-cdp-overlay.dtbo \ + display/cliffs-sde-display-rcm-overlay.dtbo \ + display/cliffs-sde-display-mtp-overlay.dtbo \ + display/cliffs-sde-display-mtp-wcd9395-overlay.dtbo \ + display/cliffs-sde-display-qrd-overlay.dtbo \ + display/cliffs-sde-display-atp-overlay.dtbo +endif else dtbo-$(CONFIG_ARCH_CLIFFS) += display/trustedvm-cliffs-sde-display-mtp-overlay.dtbo \ display/trustedvm-cliffs-sde-display-cdp-overlay.dtbo \ @@ -76,7 +82,9 @@ dtbo-$(CONFIG_ARCH_CLIFFS) += display/trustedvm-cliffs-sde-display-mtp-overlay.d endif ifneq ($(CONFIG_ARCH_QTI_VM), y) -dtbo-$(CONFIG_ARCH_VOLCANO) += display/volcano-sde.dtbo \ +dtbo-$(CONFIG_ARCH_VOLCANO) += display/volcano-sde.dtbo +ifneq ($(CONFIG_OPLUS_DEVICE_DTBS), y) +dtbo-$(CONFIG_ARCH_VOLCANO) += \ display/volcano-sde-fp1.dtbo \ display/volcano-sde-fp2.dtbo \ display/volcano-sde-fp3.dtbo \ @@ -93,6 +101,7 @@ dtbo-$(CONFIG_ARCH_VOLCANO) += display/volcano-sde.dtbo \ display/volcano-sde-display-iot-mtp-wcd9395-overlay.dtbo \ display/volcano-sde-display-iot-mtp-wcd9395-pm7550ba-overlay.dtbo \ display/volcano-sde-display-iot-mtp-wingmate-overlay.dtbo +endif else dtbo-$(CONFIG_ARCH_VOLCANO) += display/trustedvm-volcano-sde-display-atp-overlay.dtbo \ display/trustedvm-volcano-sde-display-idp-overlay.dtbo \