From f1d578258afa4fe0f6e20cb50fb05bdc18d6db0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwangyougang=E2=80=9D?= <wangyougang2@huawei.com>
Date: Thu, 5 May 2022 04:38:47 +0000
Subject: [PATCH] fix:modify wifi chip name strong bounden
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: “wangyougang” <wangyougang2@huawei.com>
---
 model/network/wifi/hdfwifi.mk             |  3 +--
 model/network/wifi/vendor/Makefile        | 10 ----------
 model/network/wifi/vendor/hi3881/Makefile |  6 ++++--
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/model/network/wifi/hdfwifi.mk b/model/network/wifi/hdfwifi.mk
index 221c8fc..2be27ef 100755
--- a/model/network/wifi/hdfwifi.mk
+++ b/model/network/wifi/hdfwifi.mk
@@ -14,7 +14,6 @@
 
 HDF_WIFI_FRAMEWORKS_ROOT = $(HDF_DIR_PREFIX)/framework/model/network/wifi
 HDF_WIFI_KHDF_FRAMEWORKS_ROOT = $(HDF_DIR_PREFIX)/adapter/khdf/linux/model/network/wifi
-HDF_WIFI_VENDOR_ROOT = $(HDF_VENDOR_PREFIX)/device/soc/hisilicon/common/platform/wifi/hi3881v100
 HDF_FRAMEWORKS_INC := \
    -I$(srctree)/drivers/hdf/framework/core/common/include/host \
    -I$(srctree)/drivers/hdf/framework/core/host/include \
@@ -54,7 +53,7 @@ HDF_WIFI_ADAPTER_INC := \
    -I$(srctree)/drivers/hdf/khdf/network/include
 
 HDF_WIFI_VENDOR_INC := \
-   -I$(srctree)/drivers/hdf/wifi/hi3881v100/adapter
+   -I$(srctree)/drivers/hdf/wifi
 
 SECURE_LIB_INC := \
    -I$(srctree)/bounds_checking_function/include
diff --git a/model/network/wifi/vendor/Makefile b/model/network/wifi/vendor/Makefile
index fa87955..9c44aba 100644
--- a/model/network/wifi/vendor/Makefile
+++ b/model/network/wifi/vendor/Makefile
@@ -18,16 +18,6 @@ HDF_VENDOR_PREFIX := ../../../../../../../../
 
 include drivers/hdf/khdf/model/network/wifi/hdfwifi.mk
 
-obj-$(CONFIG_DRIVERS_HDF_WIFI) += $(MODULE_NAME).o
-$(MODULE_NAME)-objs := $(HDF_WIFI_VENDOR_ROOT)/adapter/hdf_wlan_sdio_adapt.o
-
-ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \
-    $(HDF_FRAMEWORKS_INC) \
-    $(HDF_WIFI_FRAMEWORKS_INC) \
-    $(HDF_WIFI_ADAPTER_INC) \
-    $(HDF_WIFI_VENDOR_INC) \
-    $(SECURE_LIB_INC)
-
 obj-$(CONFIG_DRIVERS_HI3881) += hi3881/
 
 ifneq ($(CONFIG_AP6XXX_WIFI6_HDF),)
diff --git a/model/network/wifi/vendor/hi3881/Makefile b/model/network/wifi/vendor/hi3881/Makefile
index dd5d23c..1d9a5f0 100755
--- a/model/network/wifi/vendor/hi3881/Makefile
+++ b/model/network/wifi/vendor/hi3881/Makefile
@@ -21,6 +21,7 @@ include drivers/hdf/khdf/model/network/wifi/hdfwifi.mk
 INC_TOP_PATH := drivers/hdf/wifi/hi3881v100/
 VENDOR_WIFI_PATH := device/soc/hisilicon/common/platform/wifi/hi3881v100
 WIFI_DRIVER_DIR := driver
+HDF_WIFI_VENDOR_ROOT = $(HDF_VENDOR_PREFIX)/device/soc/hisilicon/common/platform/wifi/hi3881v100
 
 ##################path of compile file :start###############
 #####wifi#####
@@ -38,7 +39,7 @@ ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \
     $(HDF_FRAMEWORKS_INC) \
     $(HDF_WIFI_FRAMEWORKS_INC) \
     $(HDF_WIFI_ADAPTER_INC) \
-    $(HDF_WIFI_VENDOR_INC) \
+    $(HDF_WIFI_VENDOR_INC)/hi3881v100/adapter \
    -I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/linuxkpi/include \
     $(SECURE_LIB_INC)
 
@@ -51,6 +52,7 @@ HI1131_HOST_CFLAGS += -Wall
 HI1131_HOST_CFLAGS += $(HI1131_WIFI_CFLAGS)
 
 obj-$(CONFIG_DRIVERS_HI3881) += $(MODULE_NAME).o
+$(MODULE_NAME)-objs := $(HDF_WIFI_VENDOR_ROOT)/adapter/hdf_wlan_sdio_adapt.o
 
 ####################################### platform module start #########################################
 oal-objs := oal_util.o oal_net.o oal_main.o oal_mem.o
@@ -115,6 +117,6 @@ hcc-objs  := $(addprefix $(HCC_PATH),$(hcc-objs))
 wifi-objs += $(mac-objs) $(hmac-objs) $(wal-objs) $(hcc-objs)
 ####################################### wifi module end #########################################
 
-$(MODULE_NAME)-objs := $(wifi-objs) $(plat-objs)
+$(MODULE_NAME)-objs += $(wifi-objs) $(plat-objs)
 
 ccflags-$(CONFIG_DRIVERS_HI3881) += $(HI1131_HOST_CFLAGS)
\ No newline at end of file
-- 
Gitee