ソースを参照

qcacld-3.0: Use WLAN_WEAR_CHIPSET to modify INI path

On Wear HL based target with keystone kernel, it generates
WLAN driver with name "qca_cld3_wlan.ko" based on macro
definition WLAN_WEAR_CHIPSET. But the driver was not loading
because of the old INI path and /dev path.
This commit modifies the INI path and /dev path based on
macro defined i.e. WLAN_WEAR_CHIPSET.

Change-Id: I6d457a3bb708de3175c40b0f2b3ba0ebde915838
CRs-Fixed: 3168115
Srikanth Marepalli 3 年 前
コミット
e2e3e0326e
4 ファイル変更15 行追加3 行削除
  1. 4 0
      Kbuild
  2. 3 3
      Makefile
  3. 4 0
      core/hdd/src/wlan_hdd_driver_ops.c
  4. 4 0
      core/hdd/src/wlan_hdd_main.c

+ 4 - 0
Kbuild

@@ -91,6 +91,10 @@ UAPI_INC :=	-I$(WLAN_ROOT)/$(UAPI_DIR)/linux
 COMMON_DIR :=	core/common
 COMMON_INC :=	-I$(WLAN_ROOT)/$(COMMON_DIR)
 
+ifeq (qca_cld3, $(WLAN_WEAR_CHIPSET))
+	cppflags-y += -DWLAN_WEAR_CHIPSET
+endif
+
 ############ HDD ############
 HDD_DIR :=	core/hdd
 HDD_INC_DIR :=	$(HDD_DIR)/inc

+ 3 - 3
Makefile

@@ -15,9 +15,9 @@ ifeq ($(WLAN_ROOT),)
 # WLAN_ROOT must contain an absolute path (i.e. not a relative path)
 KBUILD_OPTIONS := WLAN_ROOT=$(shell cd $(KERNEL_SRC); readlink -e $(M))
 
-# MODNAME should be qca_cld3_wlan for helium based platform
-ifeq (qca_cld3, $(WLAN_CHIPSET))
-KBUILD_OPTIONS += MODNAME?=$(WLAN_CHIPSET)_wlan
+# MODNAME should be qca_cld3_wlan for helium based wear target
+ifeq (qca_cld3, $(WLAN_WEAR_CHIPSET))
+KBUILD_OPTIONS += MODNAME?=$(WLAN_WEAR_CHIPSET)_wlan
 else
 KBUILD_OPTIONS += MODNAME?=wlan
 endif

+ 4 - 0
core/hdd/src/wlan_hdd_driver_ops.c

@@ -51,7 +51,11 @@
 #include "wlan_hdd_bus_bandwidth.h"
 
 #ifdef MODULE
+#ifdef WLAN_WEAR_CHIPSET
+#define WLAN_MODULE_NAME  "wlan"
+#else
 #define WLAN_MODULE_NAME  module_name(THIS_MODULE)
+#endif
 #else
 #define WLAN_MODULE_NAME  "wlan"
 #endif

+ 4 - 0
core/hdd/src/wlan_hdd_main.c

@@ -224,7 +224,11 @@
 #include "wlan_hdd_mcc_quota.h"
 
 #ifdef MODULE
+#ifdef WLAN_WEAR_CHIPSET
+#define WLAN_MODULE_NAME  "wlan"
+#else
 #define WLAN_MODULE_NAME  module_name(THIS_MODULE)
+#endif
 #else
 #define WLAN_MODULE_NAME  "wlan"
 #endif