diff --git a/model/network/wifi/hdfwifi.mk b/model/network/wifi/hdfwifi.mk index 221c8fc493d9440f83f82db16816adf5e254f95b..cad9f9da04fbab67d8e157a8481a6cf69acc68cf 100755 --- a/model/network/wifi/hdfwifi.mk +++ b/model/network/wifi/hdfwifi.mk @@ -14,7 +14,7 @@ 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_WIFI_VENDOR_ROOT = $(HDF_VENDOR_PREFIX)/device/soc/hisilicon/common/platform/wifi HDF_FRAMEWORKS_INC := \ -I$(srctree)/drivers/hdf/framework/core/common/include/host \ -I$(srctree)/drivers/hdf/framework/core/host/include \ @@ -54,7 +54,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 fa87955cef0ec790f9c73a948ea0a22e764101e9..c18b841bd645e675dc9810ab177fd7568d4556e8 100644 --- a/model/network/wifi/vendor/Makefile +++ b/model/network/wifi/vendor/Makefile @@ -19,13 +19,13 @@ 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 +$(MODULE_NAME)-objs := $(HDF_WIFI_VENDOR_ROOT)/hi3881v100/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) \ + $(HDF_WIFI_VENDOR_INC)/hi3881v100/adapter \ $(SECURE_LIB_INC) obj-$(CONFIG_DRIVERS_HI3881) += hi3881/ diff --git a/model/network/wifi/vendor/hi3881/Makefile b/model/network/wifi/vendor/hi3881/Makefile index dd5d23c57369a7e8de0eadc2b19e9d36ec64e03d..5fa5c4082abfc6b3587be0a5ea6bbddb91bf461c 100755 --- a/model/network/wifi/vendor/hi3881/Makefile +++ b/model/network/wifi/vendor/hi3881/Makefile @@ -18,9 +18,9 @@ HDF_VENDOR_PREFIX := ../../../../../../../../../ include drivers/hdf/khdf/model/network/wifi/hdfwifi.mk -INC_TOP_PATH := drivers/hdf/wifi/hi3881v100/ +INC_TOP_PATH := drivers/hdf/wifi/ VENDOR_WIFI_PATH := device/soc/hisilicon/common/platform/wifi/hi3881v100 -WIFI_DRIVER_DIR := driver +WIFI_DRIVER_DIR := hi3881v100/driver ##################path of compile file :start############### #####wifi##### @@ -33,12 +33,13 @@ HCC_PATH := $(HDF_WIFI_VENDOR_ROOT)/$(WIFI_DRIVER_DIR)/hcc/ WAL_PATH := $(HDF_WIFI_VENDOR_ROOT)/$(WIFI_DRIVER_DIR)/wal/ ADPATER_PATH := $(HDF_WIFI_VENDOR_ROOT)/$(WIFI_DRIVER_DIR)/hdfadapt/ ##################path of compile file :end############### +###################### 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)