From 17e671c82160c9c37599b0f3a45b87b69c23f8d6 Mon Sep 17 00:00:00 2001 From: Manikandan Mohan Date: Tue, 21 Jan 2020 21:20:31 -0800 Subject: [PATCH] defconfig: Split CNSS configs to GKI and debug Place CNSS base and debug Kconfigs in corresponding GKI fragment config file. Change-Id: I3e20fde45dace4ee40e7ff7f671873aa25754eb9 Signed-off-by: Manikandan Mohan --- arch/arm64/configs/vendor/lahaina_GKI.config | 8 ++++++++ arch/arm64/configs/vendor/lahaina_QGKI.config | 1 + arch/arm64/configs/vendor/lahaina_debug.config | 12 ++---------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config index 2169542a500e..bc2a4fd51b33 100644 --- a/arch/arm64/configs/vendor/lahaina_GKI.config +++ b/arch/arm64/configs/vendor/lahaina_GKI.config @@ -103,6 +103,14 @@ CONFIG_IPA_USB=m CONFIG_IPA_WDI_UNIFIED_API=y CONFIG_RMNET_IPA3=y CONFIG_RNDIS_IPA=m +CONFIG_CNSS2=m +CONFIG_CNSS2_QMI=y +CONFIG_CNSS_ASYNC=y +CONFIG_BUS_AUTO_SUSPEND=y +CONFIG_CNSS_QCA6490=y +CONFIG_CNSS_UTILS=m +CONFIG_CNSS_GENL=m +CONFIG_WCNSS_MEM_PRE_ALLOC=m CONFIG_QCOM_SECURE_BUFFER=m CONFIG_ION_MSM_HEAPS=m CONFIG_QCOM_CLK_RPMH=m diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config index c100ff72d0b9..7d2d35b8c5b3 100644 --- a/arch/arm64/configs/vendor/lahaina_QGKI.config +++ b/arch/arm64/configs/vendor/lahaina_QGKI.config @@ -76,6 +76,7 @@ CONFIG_QTI_TZ_LOG=y CONFIG_QCOM_MEMORY_DUMP_V2=y CONFIG_MSM_REMOTEQDSS=y CONFIG_QCOM_DCC_V2=y +CONFIG_CLD_LL_CORE=y CONFIG_CORESIGHT_QGKI=y CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y CONFIG_CORESIGHT_CTI=y diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config index f55e0ffeb231..a10291ac76c6 100644 --- a/arch/arm64/configs/vendor/lahaina_debug.config +++ b/arch/arm64/configs/vendor/lahaina_debug.config @@ -26,6 +26,8 @@ CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS=y CONFIG_COMMON_CLK_QCOM_DEBUG=y CONFIG_I2C_MSM_GENI=y CONFIG_SPI_MSM_GENI=y +CONFIG_CNSS2_DEBUG=y +CONFIG_NL80211_TESTMODE=y CONFIG_MSM_GPI_DMA=y CONFIG_MSM_GPI_DMA_DEBUG=y CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE=y @@ -34,16 +36,6 @@ CONFIG_I3C_MASTER_MSM_GENI=y # CONFIG_CDNS_I3C_MASTER is not set # CONFIG_DW_I3C_MASTER is not set CONFIG_CORESIGHT_SOURCE_ETM4X=y -CONFIG_CLD_LL_CORE=y -CONFIG_CNSS2=m -CONFIG_CNSS2_DEBUG=y -CONFIG_CNSS2_QMI=y -CONFIG_CNSS_ASYNC=y -CONFIG_BUS_AUTO_SUSPEND=y -CONFIG_CNSS_QCA6490=y -CONFIG_CNSS_UTILS=m -CONFIG_CNSS_GENL=m -CONFIG_WCNSS_MEM_PRE_ALLOC=m CONFIG_MHI_BUS=y CONFIG_MHI_DEBUG=y CONFIG_MHI_UCI=y