diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config
index bd0dd2d0bf2a..a197fb3cc61d 100644
--- a/arch/arm64/configs/vendor/pineapple_GKI.config
+++ b/arch/arm64/configs/vendor/pineapple_GKI.config
@@ -6,6 +6,19 @@ CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_QCOM=m
 # CONFIG_CHARGER_QCOM_SMBB is not set
 CONFIG_COMMON_CLK_QCOM=m
+CONFIG_CORESIGHT=m
+CONFIG_CORESIGHT_CSR=m
+CONFIG_CORESIGHT_CTI=m
+CONFIG_CORESIGHT_DUMMY=m
+CONFIG_CORESIGHT_HWEVENT=m
+CONFIG_CORESIGHT_LINKS_AND_SINKS=m
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=m
+CONFIG_CORESIGHT_REMOTE_ETM=m
+CONFIG_CORESIGHT_STM=m
+CONFIG_CORESIGHT_TGU=m
+CONFIG_CORESIGHT_TPDA=m
+CONFIG_CORESIGHT_TPDM=m
+CONFIG_CORESIGHT_TRACE_NOC=m
 CONFIG_CPU_IDLE_GOV_QCOM_LPM=m
 # CONFIG_EDAC_QCOM is not set
 CONFIG_GH_ARM64_DRV=m
@@ -150,6 +163,10 @@ CONFIG_SM_VIDEOCC_PINEAPPLE=m
 CONFIG_SPI_MSM_GENI=m
 CONFIG_SPMI_MSM_PMIC_ARB=m
 CONFIG_SPMI_QTI_GLINK_DEBUG=m
+CONFIG_STM=m
+CONFIG_STM_PROTO_OST=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_FTRACE=m
 CONFIG_UCSI_QTI_GLINK=m
 CONFIG_USB_CONFIGFS_F_CCID=m
 CONFIG_USB_CONFIGFS_F_CDEV=m
diff --git a/arch/arm64/configs/vendor/pineapple_consolidate.config b/arch/arm64/configs/vendor/pineapple_consolidate.config
index ac8f7af233b2..3082df5995f3 100644
--- a/arch/arm64/configs/vendor/pineapple_consolidate.config
+++ b/arch/arm64/configs/vendor/pineapple_consolidate.config
@@ -1,6 +1,7 @@
 CONFIG_ATOMIC64_SELFTEST=m
 CONFIG_CMA_DEBUG=y
 CONFIG_CMA_DEBUGFS=y
+CONFIG_CORESIGHT_SOURCE_ETM4X=m
 CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y
 CONFIG_DEBUG_SPINLOCK=y