From dad3dbc8600e0d4111fb14e8b9736a6fc8d41296 Mon Sep 17 00:00:00 2001
From: Park Ju Hyung <qkrwngud825@gmail.com>
Date: Sun, 24 Feb 2019 00:15:17 +0900
Subject: [PATCH] qcacld: nuke Kconfig-based configuration entirely

This method of building qcacld isn't meant to be used and
causes conflicts with the new OEM profile configuration.

Configuration is now done with drivers/staging/qcacld-3.0/configs.

Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com>
(cherry picked from commit 1bdd23fcaaef57db47ea69720f51aed47353482c)
---
 drivers/staging/qcacld-3.0/Kbuild  |   2 +-
 drivers/staging/qcacld-3.0/Kconfig | 155 ++---------------------------
 2 files changed, 9 insertions(+), 148 deletions(-)

diff --git a/drivers/staging/qcacld-3.0/Kbuild b/drivers/staging/qcacld-3.0/Kbuild
index bba0db6d0eec..e40f0949734d 100644
--- a/drivers/staging/qcacld-3.0/Kbuild
+++ b/drivers/staging/qcacld-3.0/Kbuild
@@ -26,7 +26,7 @@ ifneq ($(ANDROID_BUILD_TOP),)
 endif
 endif
 
-include $(WLAN_ROOT)/configs/$(CONFIG_QCA_CLD_WLAN_PROFILE)_defconfig
+include $(WLAN_ROOT)/configs/$(patsubst "%",%,$(CONFIG_QCA_CLD_WLAN_PROFILE))_defconfig
 
 ############ UAPI ############
 UAPI_DIR :=	uapi
diff --git a/drivers/staging/qcacld-3.0/Kconfig b/drivers/staging/qcacld-3.0/Kconfig
index bb65a842cdc8..421fa320e961 100644
--- a/drivers/staging/qcacld-3.0/Kconfig
+++ b/drivers/staging/qcacld-3.0/Kconfig
@@ -1,159 +1,20 @@
 comment "Qualcomm Atheros CLD WLAN module"
 
 config QCA_CLD_WLAN
-
 	tristate "Qualcomm Atheros CLD WLAN module"
 	default n
 	help
-	Add support for the Qualcomm Atheros CLD WLAN module
+	  Add support for the Qualcomm Atheros CLD WLAN module
 
 if QCA_CLD_WLAN != n
 
-config QCACLD_WLAN_LFR3
-	bool "Enable the WLAN Legacy Fast Roaming feature Version 3"
-	default n
+config QCA_CLD_WLAN_PROFILE
+	string "Configuration profile for Qualcomm Atheros CLD WLAN module"
+	default "default"
+	help
+	  Specify which configuration profile to be used for building
+	  this module.
 
-config PRIMA_WLAN_OKC
-	bool "Enable the Prima WLAN Opportunistic Key Caching feature"
-	default n
-
-config WLAN_FEATURE_11W
-	bool "Enable the WLAN 802.11w Protected Management Frames feature"
-	default n
-
-config WLAN_FEATURE_LPSS
-	bool "Enable the WLAN LPSS feature"
-	default n
-
-config QCOM_VOWIFI_11R
-	bool "Enable Fast Transition (11r) feature"
-	default n
-
-config QCACLD_FEATURE_NAN
-	bool "Enable NAN feature"
-	default n
-
-config WLAN_FEATURE_NAN_DATAPATH
-	bool "Enable NaN Data Path feature"
-	depends on QCACLD_FEATURE_NAN
-	default n
-
-config QCACLD_FEATURE_GREEN_AP
-	bool "Enable Green AP feature"
-	default n
-
-config HELIUMPLUS
-	bool "Enable Beeliner based descriptor structures for Helium"
-	default n
-
-config 64BIT_PADDR
-	bool "Enable 37-bit physical/bus addresses"
-	depends on HELIUMPLUS
-	default n
-
-config QCOM_TDLS
-	bool "Enable TDLS feature"
-	default n
-
-config QCOM_LTE_COEX
-	bool "Enable QCOM LTE Coex feature"
-	default n
-
-config MPC_UT_FRAMEWORK
-	bool "Enable Unit test framework for multiport concurrency"
-	default n
-
-config WLAN_OFFLOAD_PACKETS
-	bool "Enable offload packets feature"
-	default n
-
-config FEATURE_TSO
-	bool "Enable TCP Segmentation Offload"
-	depends on HELIUMPLUS
-	default n
-
-config FEATURE_TSO_DEBUG
-	bool "Enable TCP Segmentation Offload with debug"
-	depends on FEATURE_TSO
-	default n
-
-config WLAN_FASTPATH
-	bool "Enable fastpath for datapackets"
-	default n
-
-config WLAN_NAPI
-	bool "Enable NAPI - datapath rx"
-	default n
-
-config WLAN_NAPI_DEBUG
-       bool "Enable debug logging on NAPI"
-       depends on WLAN_NAPI
-       default n
-
-config WLAN_TX_FLOW_CONTROL_V2
-	bool "Enable tx flow control version:2"
-	default n
-
-config WLAN_LRO
-	bool "Enable Large Receive Offload"
-	depends on HELIUMPLUS
-	depends on INET_LRO
-	default n
-
-config WLAN_SYNC_TSF
-	bool "Enable QCOM sync multi devices tsf feature"
-	default n
-
-config LFR_SUBNET_DETECTION
-	bool "Enable LFR Subnet Change Detection"
-	default n
-
-config MCC_TO_SCC_SWITCH
-	bool "Enable MCC to SCC Switch Logic"
-	default n
-
-config QCACLD_WLAN_LFR2
-	bool "Enable the WLAN Legacy Fast Roaming feature Version 2"
-	default n
-
-config WLAN_FEATURE_DISA
-	bool "Enable DISA certification feature"
-	default n
-
-config WLAN_FEATURE_FIPS
-	bool "Enable FIPS certification feature"
-	default n
-
-config WLAN_FEATURE_11AX
-	bool "Enable 11AX(High Efficiency) feature"
-	default n
-
-config ICMP_DISABLE_PS
-	bool "Enable ICMP packet disable powersave feature"
-	default n
-
-config BUILD_TIMESTAMP
-	bool "Embed timestamp in wlan version"
-	default n
-
-config WLAN_FEATURE_FILS
-	bool "Enable FILS feature"
-	default n
-
-config NAN_CONVERGENCE
-	bool "Enable NAN_CONVERGENCE feature"
-	default n
-
-config WLAN_OBJMGR_DEBUG
-	bool "Enable WLAN Obj Mgr Debug services"
-	default n
-
-config WLAN_FEATURE_DFS_OFFLOAD
-	bool "Enable dfs offload feature"
-	default n
-
-config WLAN_FEATURE_SARV1_TO_SARV2
-	bool "Enable conversion of SAR v1 to v2 feature"
-	default n
+	  Profiles are located at drivers/staging/qcacld-3.0/configs.
 
 endif # QCA_CLD_WLAN