commit c3245a5d8f8f62b349b5335c57c1047bfd3a4111
author Mahesh Kumar Kalikot Veetil <mkalikot@codeaurora.org> Sun Apr 05 15:09:30 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 15 11:36:06 2020 -0700
tree a88704a999a20cea8652d2cbea1f118758cf167b
parent 267b877bc36f2098fe89eddced07a2a15694378a

qcacld-3.0: Include config file only after override

Include defconfig profile only after processing WLAN_CFG_OVERRIDE.

Change-Id: I11164995061ee057dfcb3abaef2af2f2d33bfd23
CRs-Fixed: 2661823

Kbuild

diff --git a/Kbuild b/Kbuild
index 6ecc05c..ed473b9 100644
--- a/Kbuild
+++ b/Kbuild
@@ -31,7 +31,6 @@
 endif
 endif
 
-include $(WLAN_ROOT)/configs/$(CONFIG_QCA_CLD_WLAN_PROFILE)_defconfig
 
 # add configurations in WLAN_CFG_OVERRIDE
 ifneq ($(WLAN_CFG_OVERRIDE),)
@@ -45,6 +44,8 @@
 $(warning "Overriding WLAN config with: $(shell cat $(WLAN_CFG_OVERRIDE_FILE))")
 endif
 
+include $(WLAN_ROOT)/configs/$(CONFIG_QCA_CLD_WLAN_PROFILE)_defconfig
+
 ############ UAPI ############
 UAPI_DIR :=	uapi
 UAPI_INC :=	-I$(WLAN_ROOT)/$(UAPI_DIR)/linux