浏览代码

qcacld-3.0: Include config file only after override

Include defconfig profile only after processing WLAN_CFG_OVERRIDE.

Change-Id: I11164995061ee057dfcb3abaef2af2f2d33bfd23
CRs-Fixed: 2661823
Mahesh Kumar Kalikot Veetil 5 年之前
父节点
当前提交
dada577f90
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Kbuild

+ 2 - 1
Kbuild

@@ -31,7 +31,6 @@ ifneq ($(ANDROID_BUILD_TOP),)
 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 @@ include $(WLAN_CFG_OVERRIDE_FILE)
 $(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