From 2d28806dca0f19cfc2dc4095d8e989d9d2b78333 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Sat, 22 Aug 2020 16:54:03 +0530 Subject: [PATCH] defconfig: Cleanup of wlan related config flags for holi In GKI, if a config is flag enabled in a QGKI config and disabled in debug config. Then that config flag will be disabled for debug build and enabled for QGKI. So, this change ensures the config flag which is enabled in lower level config gets enabled for higher level config. Change-Id: I6c5176e30d72a86bc6cce3b2074a8dd1d08a1e28 Signed-off-by: Sandeep Singh --- arch/arm64/configs/vendor/holi_GKI.config | 2 -- arch/arm64/configs/vendor/holi_debug.config | 4 ---- 2 files changed, 6 deletions(-) diff --git a/arch/arm64/configs/vendor/holi_GKI.config b/arch/arm64/configs/vendor/holi_GKI.config index ed4f7fbe304f..dd5a079e36b6 100644 --- a/arch/arm64/configs/vendor/holi_GKI.config +++ b/arch/arm64/configs/vendor/holi_GKI.config @@ -140,8 +140,6 @@ CONFIG_CNSS_GENL=m CONFIG_WCNSS_MEM_PRE_ALLOC=m CONFIG_ICNSS2=m CONFIG_ICNSS2_QMI=y -# CONFIG_ICNSS2_DEBUG is not set -# CONFIG_CNSS_QCA6750 is not set CONFIG_ARM_QCOM_CPUFREQ_HW=m CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_SM_GPUCC_HOLI=m diff --git a/arch/arm64/configs/vendor/holi_debug.config b/arch/arm64/configs/vendor/holi_debug.config index f44acc08f49b..ca6c5d915d5f 100644 --- a/arch/arm64/configs/vendor/holi_debug.config +++ b/arch/arm64/configs/vendor/holi_debug.config @@ -98,9 +98,6 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_MEMINIT is not set CONFIG_CRC8=y # CONFIG_PCI_MSM is not set -# CONFIG_CNSS_UTILS is not set -# CONFIG_CNSS_GENL is not set -# CONFIG_WCNSS_MEM_PRE_ALLOC is not set CONFIG_MSM_REMOTEQDSS=y CONFIG_LKDTM=y CONFIG_MSM_RPM_SMD=y @@ -108,7 +105,6 @@ CONFIG_DEBUG_PANIC_ON_OOM=y CONFIG_KPROBES=y CONFIG_QCOM_MPM=y CONFIG_ICNSS2_DEBUG=y -# CONFIG_CLD_LL_CORE is not set CONFIG_INTERCONNECT_TEST=y CONFIG_INTERCONNECT_QCOM_HOLI=y # CONFIG_CORESIGHT_CTI_SAVE_DISABLE is not set