From 7dac9d91a91c4a4f8a578f79022eeea5356d40b9 Mon Sep 17 00:00:00 2001 From: kerninfo Date: Sat, 14 May 2022 11:30:11 +0800 Subject: [PATCH 1/6] modify HDF wlan bus compilation configuration selection Signed-off-by: kerninfo --- model/network/wifi/Kconfig | 14 ++++++++++++++ model/network/wifi/Makefile | 10 +++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/model/network/wifi/Kconfig b/model/network/wifi/Kconfig index 7d893dd..26959e2 100644 --- a/model/network/wifi/Kconfig +++ b/model/network/wifi/Kconfig @@ -5,6 +5,20 @@ config DRIVERS_HDF_WIFI help Answer Y to enable HDF wifi. +config DRIVERS_HDF_WLAN_SDIO + bool "Enable HDF wlan sdio bus" + default n + depends on DRIVERS_HDF_WIFI + help + Answer Y to support HDF wlan sdio bus + +config DRIVERS_HDF_WLAN_USB + bool "Enable HDF wlan usb bus" + default n + depends on DRIVERS_HDF_WIFI + help + Answer Y to support HDF wlan usb bus + config DRIVERS_HI3881 bool "Enable hi3881" default n diff --git a/model/network/wifi/Makefile b/model/network/wifi/Makefile index 0e8fe75..c1c9c2b 100644 --- a/model/network/wifi/Makefile +++ b/model/network/wifi/Makefile @@ -51,12 +51,16 @@ $(MODULE_NAME)-objs := $(HDF_WIFI_FRAMEWORKS_ROOT)/$(WAP_PATH)/ap.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wifi_event.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_chipdriver_manager.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_config_parser.o \ - $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_power_manager.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_product.o \ - $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_reset_manager.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_utils.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_ibus_intf.o \ - $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_sdio_intf.o \ + +$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_SDIO) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_sdio_intf.o +$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_SDIO) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_wlan_sdio_power_manager.o +$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_SDIO) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_wlan_sdio_reset_manager.o +$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_USB) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_usb_intf.o +$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_USB) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_wlan_usb_power_manager.o +$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_USB) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_wlan_usb_reset_manager.o ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \ $(HDF_FRAMEWORKS_INC) \ -- Gitee From ad3d03e703a027b825391a456d7d9db1ad69ec4c Mon Sep 17 00:00:00 2001 From: kerninfo Date: Wed, 18 May 2022 15:28:00 +0800 Subject: [PATCH 2/6] modify HDF wlan bus compilation configuration selection Signed-off-by: kerninfo --- model/network/wifi/Kconfig | 6 ++++++ model/network/wifi/Makefile | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/model/network/wifi/Kconfig b/model/network/wifi/Kconfig index 26959e2..2d66777 100644 --- a/model/network/wifi/Kconfig +++ b/model/network/wifi/Kconfig @@ -26,6 +26,12 @@ config DRIVERS_HI3881 help Answer Y to enable hi3881 wifi chip driver. +config DRIVERS_RTL8723DU + bool "Enable rtl8723du" + default n + depends on DRIVERS_HDF_WIFI + help + Answer Y to enable rtl8723du wifi chip driver. config DRIVERS_HDF_NETDEV_EXT bool "Get Linux net device from HDF" diff --git a/model/network/wifi/Makefile b/model/network/wifi/Makefile index c1c9c2b..9f3c3af 100644 --- a/model/network/wifi/Makefile +++ b/model/network/wifi/Makefile @@ -51,16 +51,14 @@ $(MODULE_NAME)-objs := $(HDF_WIFI_FRAMEWORKS_ROOT)/$(WAP_PATH)/ap.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wifi_event.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_chipdriver_manager.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_config_parser.o \ + $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_power_manager.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_product.o \ + $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_reset_manager.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(PLATFORM_PATH)/hdf_wlan_utils.o \ $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_ibus_intf.o \ $(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_SDIO) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_sdio_intf.o -$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_SDIO) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_wlan_sdio_power_manager.o -$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_SDIO) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_wlan_sdio_reset_manager.o $(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_USB) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_usb_intf.o -$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_USB) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_wlan_usb_power_manager.o -$(MODULE_NAME)-$(CONFIG_DRIVERS_HDF_WLAN_USB) += $(HDF_WIFI_FRAMEWORKS_ROOT)/$(IBUS_PATH)/hdf_wlan_usb_reset_manager.o ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \ $(HDF_FRAMEWORKS_INC) \ -- Gitee From e7542b47eb7e623d20b374c2f2b6d0d7a2268526 Mon Sep 17 00:00:00 2001 From: kerninfo Date: Thu, 19 May 2022 13:44:11 +0800 Subject: [PATCH 3/6] add rtl8723du kernel config Signed-off-by: kerninfo --- model/network/wifi/Kconfig | 22 ++++++++++++---------- model/network/wifi/vendor/Makefile | 4 ++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/model/network/wifi/Kconfig b/model/network/wifi/Kconfig index 2d66777..207b2c5 100644 --- a/model/network/wifi/Kconfig +++ b/model/network/wifi/Kconfig @@ -26,25 +26,27 @@ config DRIVERS_HI3881 help Answer Y to enable hi3881 wifi chip driver. -config DRIVERS_RTL8723DU - bool "Enable rtl8723du" - default n - depends on DRIVERS_HDF_WIFI - help - Answer Y to enable rtl8723du wifi chip driver. - config DRIVERS_HDF_NETDEV_EXT bool "Get Linux net device from HDF" default n help Get Linux net device from HDF +config DRIVERS_RTL8723DU + bool "Enable Realtek 8723D USB WiFi(rtl8723du)" + default n + depends on DRIVERS_HDF_WIFI + select DRIVERS_HDF_WLAN_USB + select DRIVERS_HDF_NETDEV_EXT + help + Answer Y to enable rtl8723du wifi chip driver. + config AP6XXX_WIFI6_HDF tristate "support ap6xxx wifi6(80211ax) HDF" depends on DRIVERS_HDF_WIFI - select CFG80211 - select MAC80211 - select DRIVERS_HDF_NETDEV_EXT + select CFG80211 + select MAC80211 + select DRIVERS_HDF_NETDEV_EXT help This driver supports wifi6 for ap6xxx HDF chipset. This driver uses the kernel's wireless extensions subsystem. diff --git a/model/network/wifi/vendor/Makefile b/model/network/wifi/vendor/Makefile index 3442661..b01185f 100644 --- a/model/network/wifi/vendor/Makefile +++ b/model/network/wifi/vendor/Makefile @@ -24,3 +24,7 @@ ifneq ($(CONFIG_AP6XXX_WIFI6_HDF),) RKWIFI_PATH := $(HDF_VENDOR_PREFIX)/device/board/$(PRODUCT_COMPANY)/$(DEVICE_NAME)/wifi obj-$(CONFIG_AP6XXX_WIFI6_HDF) += $(RKWIFI_PATH)/ endif + +ifneq ($(CONFIG_DRIVERS_RTL8723DU),) +obj-$(CONFIG_DRIVERS_RTL8723DU) += $(HDF_VENDOR_PREFIX)/out/KERNEL_OBJ/kernel/src_tmp/linux-5.10/drivers/net/wireless/rtl/ +#endif -- Gitee From cd083cde29a701598a0dfb92f7cb5d3df91da75c Mon Sep 17 00:00:00 2001 From: kerninfo Date: Thu, 19 May 2022 14:01:44 +0800 Subject: [PATCH 4/6] add rtl8723du kernel config Signed-off-by: kerninfo --- model/network/wifi/vendor/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/network/wifi/vendor/Makefile b/model/network/wifi/vendor/Makefile index b01185f..be658f7 100644 --- a/model/network/wifi/vendor/Makefile +++ b/model/network/wifi/vendor/Makefile @@ -27,4 +27,4 @@ endif ifneq ($(CONFIG_DRIVERS_RTL8723DU),) obj-$(CONFIG_DRIVERS_RTL8723DU) += $(HDF_VENDOR_PREFIX)/out/KERNEL_OBJ/kernel/src_tmp/linux-5.10/drivers/net/wireless/rtl/ -#endif +endif -- Gitee From 08950afd6894346dc7692494d23f080d29ca6952 Mon Sep 17 00:00:00 2001 From: kerninfo Date: Fri, 20 May 2022 15:06:32 +0800 Subject: [PATCH 5/6] Move the compiled configuration to the device repository Signed-off-by: kerninfo --- model/network/wifi/vendor/Makefile | 2 +- model/network/wifi/vendor/hi3881/Makefile | 122 ------- .../network/wifi/vendor/hi3881/env_config.mk | 297 ------------------ 3 files changed, 1 insertion(+), 420 deletions(-) delete mode 100755 model/network/wifi/vendor/hi3881/Makefile delete mode 100644 model/network/wifi/vendor/hi3881/env_config.mk diff --git a/model/network/wifi/vendor/Makefile b/model/network/wifi/vendor/Makefile index be658f7..02f5484 100644 --- a/model/network/wifi/vendor/Makefile +++ b/model/network/wifi/vendor/Makefile @@ -18,7 +18,7 @@ HDF_VENDOR_PREFIX := ../../../../../../../../ include drivers/hdf/khdf/model/network/wifi/hdfwifi.mk -obj-$(CONFIG_DRIVERS_HI3881) += hi3881/ +obj-y += $(HDF_VENDOR_PREFIX)/device/soc/hisilicon/common/platform/wifi/ ifneq ($(CONFIG_AP6XXX_WIFI6_HDF),) RKWIFI_PATH := $(HDF_VENDOR_PREFIX)/device/board/$(PRODUCT_COMPANY)/$(DEVICE_NAME)/wifi diff --git a/model/network/wifi/vendor/hi3881/Makefile b/model/network/wifi/vendor/hi3881/Makefile deleted file mode 100755 index 1d9a5f0..0000000 --- a/model/network/wifi/vendor/hi3881/Makefile +++ /dev/null @@ -1,122 +0,0 @@ -# -# Copyright (c) 2020-2021 Huawei Device Co., Ltd. -# -# This software is licensed under the terms of the GNU General Public -# License version 2, as published by the Free Software Foundation, and -# may be copied, distributed, and modified under those terms. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# - -MODULE_NAME := hi3881 - -HDF_VENDOR_PREFIX := ../../../../../../../../../ - -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##### -OAL_PATH := $(HDF_WIFI_VENDOR_ROOT)/$(WIFI_DRIVER_DIR)/oal/ -OAM_PATH := $(HDF_WIFI_VENDOR_ROOT)/$(WIFI_DRIVER_DIR)/oam/ -FRW_PATH := $(HDF_WIFI_VENDOR_ROOT)/$(WIFI_DRIVER_DIR)/frw/ -MAC_PATH := $(HDF_WIFI_VENDOR_ROOT)/$(WIFI_DRIVER_DIR)/mac/common/ -HMAC_PATH := $(HDF_WIFI_VENDOR_ROOT)/$(WIFI_DRIVER_DIR)/mac/hmac/ -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)/hi3881v100/adapter \ - -I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/linuxkpi/include \ - $(SECURE_LIB_INC) - -include drivers/hdf/khdf/model/network/wifi/vendor/hi3881/env_config.mk - -HI1131_HOST_CFLAGS += -Wextra -fsigned-char -fno-strict-aliasing -Wdate-time \ - -Wformat=2 -Wshadow -fvisibility=hidden -fno-common -fstack-protector-strong - -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 -oal-objs += oal_cfg80211.o oal_sdio_host.o oal_kernel_file.o exception_rst.o \ - plat_firmware.o plat_pm.o plat_pm_wlan.o plat_sdio.o oal_chr.o -oal-objs := $(addprefix $(OAL_PATH),$(oal-objs)) - -adapter-objs := hdfinit_3881.o net_adpater.o hdf_driver_register.o -adapter-objs := $(addprefix $(ADPATER_PATH),$(adapter-objs)) - -oam-objs := oam_main.o oam_log.o -oam-objs := $(addprefix $(OAM_PATH),$(oam-objs)) - -board-objs := plat_board_common_sdio.o -board-objs := $(addprefix $(OAL_PATH),$(board-objs)) - -frw-objs += frw_event.o frw_event_sched.o frw_main.o frw_task.o frw_timer.o -frw-objs := $(addprefix $(FRW_PATH),$(frw-objs)) - -plat-objs = $(oal-objs) $(oam-objs) $(board-objs) $(frw-objs) $(adapter-objs) -####################################### platform module end ######################################### - -####################################### wifi module start ######################################### -hmac-objs := hmac_11i.o hmac_blockack.o hmac_chan_mgmt.o hmac_config.o hmac_crypto_tkip.o hmac_event.o hmac_uapsd.o \ - hmac_device.o hmac_encap_frame.o hmac_encap_frame_ap.o hmac_encap_frame_sta.o hmac_frag.o hmac_fsm.o \ - hmac_mgmt_ap.o hmac_mgmt_bss_comm.o hmac_mgmt_classifier.o hmac_mgmt_sta.o hmac_protection.o hmac_user.o \ - hmac_rx_data.o hmac_tx_data.o hmac_rx_filter.o hmac_scan.o hmac_sme_sta.o hmac_vap.o \ - hmac_main.o - -ifeq ($(CFG_EDCA_OPT_AP), y) -hmac-objs += hmac_edca_opt.o -endif -ifeq ($(CFG_P2P), y) -hmac-objs += hmac_p2p.o -endif -ifeq ($(CFG_TCP_OPT), y) -hmac-objs += hmac_tcp_opt.o -endif -ifeq ($(CFG_TX_CLASSIFY_LAN_TO_WLAN), y) -hmac-objs += hmac_traffic_classify.o -endif -ifeq ($(CFG_WOW), y) -hmac-objs += hmac_wow.o -endif -ifeq ($(CFG_ANY), y) -hmac-objs += hmac_any.o -endif -ifeq ($(CFG_WAPI), y) -hmac-objs += hmac_wapi.o hmac_wapi_wpi.o hmac_wapi_sms4.o -endif -hmac-objs := $(addprefix $(HMAC_PATH),$(hmac-objs)) - -wal-objs := wal_customize.o wal_cfg80211.o wal_11d.o wal_hipriv.o wal_event_msg.o hi_wifi_driver_api.o wal_linux_flowctl.o wal_ioctl.o wal_event.o wal_scan.o wal_main.o wal_regdb.o wal_mac80211.o -wal-objs := $(addprefix $(WAL_PATH),$(wal-objs)) - -mac-objs := mac_data.o mac_device.o mac_frame.o mac_ie.o mac_user.o mac_vap.o mac_mib.o mac_resource.o mac_regdomain.o mac_pm_driver.o -mac-objs := $(addprefix $(MAC_PATH),$(mac-objs)) - -hcc-objs := hcc_comm.o hcc_task.o hcc_host.o hcc_hmac.o hmac_hcc_adapt.o -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) - -ccflags-$(CONFIG_DRIVERS_HI3881) += $(HI1131_HOST_CFLAGS) \ No newline at end of file diff --git a/model/network/wifi/vendor/hi3881/env_config.mk b/model/network/wifi/vendor/hi3881/env_config.mk deleted file mode 100644 index c9256c0..0000000 --- a/model/network/wifi/vendor/hi3881/env_config.mk +++ /dev/null @@ -1,297 +0,0 @@ -# -# Copyright (c) 2020-2021 Huawei Device Co., Ltd. -# -# This software is licensed under the terms of the GNU General Public -# License version 2, as published by the Free Software Foundation, and -# may be copied, distributed, and modified under those terms. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# - -#####################################WiFi config###################################### -CFG_ANTI_INTERF = y -CFG_CCA_OPT = y -CFG_DBAC = y -CFG_EDCA_OPT = y -CFG_EDCA_OPT_AP = y -CFG_SCHEDULE = y -CFG_TRAFFIC_CTL = n -CFG_TPC = y -CFG_RF_1102CALI = y -CFG_RF_110X_CALI_DPD = n -CFG_NEW_IQ = y -CFG_ALG_CFG = n -CFG_HCC_TASK = y -########################flash cut begin######################## -######## CFG_XXX_ROM can't be set to n ######## -CFG_P2P = y -CFG_P2P_ROM = y -CFG_WAPI = n -CFG_WAPI_ROM = y -CFG_WOW = y -CFG_WOW_ROM = y -CFG_REKEY_OFFLOAD = n -CFG_REKEY_OFFLOAD_ROM = y -CFG_PROMIS = y -CFG_PROMIS_ROM = y -CFG_MFG_TEST = y -CFG_CE_MODE = y -CFG_FCC_MODE = n -CFG_MFG_FW = n -########################flash cut end########################## -CFG_BTCOEX_ROM = y -CFG_ANY = n -CFG_STA_PM = y -CFG_MESH = n -CFG_TCP_OPT = n -CFG_TX_CLASSIFY_LAN_TO_WLAN = n -CFG_UAPSD = y -CFG_ARP_OFFLOAD = y -CFG_DHCP_OFFLOAD = y -CFG_LITEOS = n -CFG_SIGMA = y -CFG_HIPRIV = y - -###################################################################################### -HI1131_WIFI_CFLAGS +=-D_PRE_OS_VERSION_LINUX=1 -HI1131_WIFI_CFLAGS +=-D_PRE_OS_VERSION_LITEOS=2 -ifeq ($(CFG_LITEOS), y) -HI1131_WIFI_CFLAGS +=-D_PRE_OS_VERSION=_PRE_OS_VERSION_LITEOS -else -HI1131_WIFI_CFLAGS +=-D_PRE_OS_VERSION=_PRE_OS_VERSION_LINUX -endif -HI1131_WIFI_CFLAGS +=-D_PRE_HDF_LINUX - -HI1131_WIFI_CFLAGS +=-D_PRE_FRW_FEATURE_PROCESS_ENTITY_THREAD=0 -HI1131_WIFI_CFLAGS +=-D_PRE_FRW_FEATURE_PROCESS_ENTITY_TASKLET=1 -HI1131_WIFI_CFLAGS +=-D_PRE_FRW_FEATURE_PROCESS_ENTITY_TYPE=_PRE_FRW_FEATURE_PROCESS_ENTITY_THREAD - -#######################################HI1131######################################### -HI1131_WIFI_CFLAGS +=-D_PRE_MULTI_CORE_MODE_SMP=1 -HI1131_WIFI_CFLAGS +=-D_PRE_MULTI_CORE_MODE_OFFLOAD_HMAC=2 -HI1131_WIFI_CFLAGS +=-D_PRE_MULTI_CORE_MODE_OFFLOAD_DMAC=3 -ifeq ($(LOSCFG_COMPILER_HI3861_FLASH), y) -HI1131_WIFI_CFLAGS +=-D_PRE_MULTI_CORE_MODE=_PRE_MULTI_CORE_MODE_SMP -else -HI1131_WIFI_CFLAGS +=-D_PRE_MULTI_CORE_MODE=_PRE_MULTI_CORE_MODE_OFFLOAD_DMAC -endif - -HI1131_WIFI_CFLAGS +=-D_PRE_BIG_CPU_ENDIAN=0 -HI1131_WIFI_CFLAGS +=-D_PRE_LITTLE_CPU_ENDIAN=1 -HI1131_WIFI_CFLAGS +=-D_PRE_CPU_ENDIAN=_PRE_LITTLE_CPU_ENDIAN -HI1131_WIFI_CFLAGS +=-D_HI_BOARD_FPGA=1 -HI1131_WIFI_CFLAGS +=-D_HI_BOARD_ASIC=2 -ifeq ($(LOSCFG_COMPILER_HI3861_ASIC), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_CHIP_VERSION=_HI_BOARD_ASIC -else -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_CHIP_VERSION=_HI_BOARD_FPGA -endif - -ifeq ($(QUICK_START),y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_QUICK_START -endif -ifeq ($(NO_32K),y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_NO_32K -endif - -ifeq ($(BOARD_FUNC), DG) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FPGA_DIGITAL -endif - -################################################################################ -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_PMF -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_AUTORATE -ifeq ($(CFG_SCHEDULE), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_SCHEDULE -endif -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_PERFORM_TPC -ifeq ($(CFG_TPC), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_TPC -endif -ifeq ($(CFG_DBAC), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_DBAC -endif -HI1131_WIFI_CFLAGS +=-D_PRE_DBAC_DYNAMIC_POLICY -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_AGGR_OPTIMIZE -ifeq ($(CFG_CCA_OPT), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_CCA_OPT -endif -ifeq ($(CFG_EDCA_OPT), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_EDCA_OPT -endif -ifeq ($(CFG_EDCA_OPT_AP), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_EDCA_OPT_AP -endif -ifeq ($(CFG_ANTI_INTERF), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_ANTI_INTERF -endif -ifeq ($(CFG_TRAFFIC_CTL), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_TRAFFIC_CTL -endif -ifeq ($(CFG_ALG_CFG),y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_ALG_CFG -endif -ifeq ($(CFG_ALG_INTRF_MODE),y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_INTRF_MODE -endif -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_ALG_CFG_ROM -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_FLOWCTRL -ifeq ($(CFG_TX_CLASSIFY_LAN_TO_WLAN), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_TX_CLASSIFY_LAN_TO_WLAN -endif -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_CLASSIFY -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_ALWAYS_TX -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_WPA -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_WPA2 -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_AMPDU -ifeq ($(CFG_ARP_OFFLOAD), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_ARP_OFFLOAD -endif -ifeq ($(CFG_DHCP_OFFLOAD), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_DHCP_OFFLOAD -endif -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_DHCP_OFFLOAD_ROM -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_PKT_MEM_OPT -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_PM_FEATURE_FORCESLP_RESUME -HI1131_WIFI_CFLAGS +=-D__BITS_PER_OAL_LONG=32 -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_11D -ifeq ($(CFG_NEW_IQ), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_NEW_IQ -endif -ifeq ($(CFG_P2P), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_P2P -endif -ifeq ($(CFG_P2P_ROM), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_P2P_ROM -endif -ifeq ($(CFG_ANY), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_ANY -endif -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_ANY_ROM -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_CSI -ifeq ($(CFG_STA_PM), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_STA_PM -endif -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_STA_UAPSD -ifeq ($(CFG_MESH), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_MESH -endif -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_MESH_ROM -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_BW_HIEX -ifeq ($(CFG_BTCOEX), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_BTCOEX -endif -ifeq ($(CFG_BTCOEX_ROM), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_BTCOEX_ROM -endif -ifeq ($(CFG_RF_110X_CALI_DPD), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_RF_110X_CALI_DPD -endif -ifeq ($(CFG_RF_1102CALI), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_RF_1102CALI -endif -ifeq ($(CFG_UAPSD), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_UAPSD -endif -ifeq ($(CFG_WAPI), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_WAPI -endif -ifeq ($(CFG_WAPI_ROM), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_WAPI_ROM -endif -ifeq ($(CFG_TCP_OPT), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_TCP_OPT -endif - -HI1131_WIFI_CFLAGS +=-D_PRE_XTAL_FREQUENCY_COMPESATION_ENABLE - -################################SDIO MMC CONFIG############################# -HI1131_WIFI_CFLAGS +=-DCONFIG_MMC -HI1131_WIFI_CFLAGS +=-DCONFIG_PRINTK -HI1131_WIFI_CFLAGS +=-D_PRE_FEATURE_NO_GPIO -ifeq ($(CFG_REKEY_OFFLOAD), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_REKEY_OFFLOAD -endif -ifeq ($(CFG_REKEY_OFFLOAD_ROM), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_REKEY_OFFLOAD_ROM -endif -ifeq ($(CFG_WOW), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_WOW -endif -ifeq ($(CFG_WOW_ROM), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_WOW_ROM -endif -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_HILINK -ifeq ($(CFG_PROMIS), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_PROMIS -endif -ifeq ($(CFG_PROMIS_ROM), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_PROMIS_ROM -endif -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_SMARTCONFIG_APP -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_TEMP_PROTECT -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_SINGLE_DEVICE - -ifeq ($(CFG_SIGMA), y) -#sigma tool support -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_SIGMA -endif - -ifeq ($(CFG_MFG_TEST), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_MFG_TEST -endif - -ifeq ($(CFG_MFG_FW), y) -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_MFG_FW -endif - -ifeq ($(CFG_CE_MODE), y) -HI1131_WIFI_CFLAGS +=-D_PRE_CE_INITIAL_PARAMS_MODE -endif - -ifeq ($(CFG_FCC_MODE), y) -HI1131_WIFI_CFLAGS +=-D_PRE_FCC_INITIAL_PARAMS_MODE -endif - -ifeq ($(CFG_HIPRIV), y) -#sdv test support -HI1131_WIFI_CFLAGS +=-D_PRE_WLAN_FEATURE_HIPRIV -ifeq ($(CFG_LITEOS), n) -HI1131_WIFI_CFLAGS +=-D_PRE_CONFIG_CONN_HISI_SYSFS_SUPPORT -else -HI1131_WIFI_CFLAGS +=-DAT_DEBUG_CMD_SUPPORT -endif -endif - -################################WAIT MODIFIED SDIO############################## -HI1131_WIFI_CFLAGS +=-D_PRE_FEATURE_SDIO=1 -HI1131_WIFI_CFLAGS +=-D_PRE_FEATURE_USB=2 -HI1131_WIFI_CFLAGS +=-D_PRE_FEATURE_CHANNEL_TYPE=_PRE_FEATURE_SDIO -HI1131_WIFI_CFLAGS +=-DCONFIG_HI110X_SDIO_STD_CARD_SUPPORT - -################################HCC_TASK############################## -ifeq ($(CFG_HCC_TASK), y) -HI1131_WIFI_CFLAGS +=-D_PRE_FEATURE_HCC_TASK -endif - -################################WIFI_DRIVER_DIR############################## -HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/wal -HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/oam -HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/mac/hmac - -HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/mac/common -HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/hcc -HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/frw -HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/oal -HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/include - -################################device############################## -HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/hdfadapt - -ifeq ($(LOSCFG_PLATFORM_HI3516EV300), y) -HI1131_WIFI_CFLAGS +=-DHISI_WIFI_PLATFORM_HI3516EV300 -endif \ No newline at end of file -- Gitee From 4592b9d1cb70a9c31d62cf13c66d8e04a34c87ec Mon Sep 17 00:00:00 2001 From: kerninfo Date: Fri, 20 May 2022 16:37:38 +0800 Subject: [PATCH 6/6] Move the compiled configuration to the device repository Signed-off-by: kerninfo --- model/network/wifi/vendor/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/model/network/wifi/vendor/Makefile b/model/network/wifi/vendor/Makefile index 02f5484..6b36865 100644 --- a/model/network/wifi/vendor/Makefile +++ b/model/network/wifi/vendor/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2020-2021 Huawei Device Co., Ltd. +# Copyright (c) 2020-2022 Huawei Device Co., Ltd. # # This software is licensed under the terms of the GNU General Public # License version 2, as published by the Free Software Foundation, and @@ -24,7 +24,3 @@ ifneq ($(CONFIG_AP6XXX_WIFI6_HDF),) RKWIFI_PATH := $(HDF_VENDOR_PREFIX)/device/board/$(PRODUCT_COMPANY)/$(DEVICE_NAME)/wifi obj-$(CONFIG_AP6XXX_WIFI6_HDF) += $(RKWIFI_PATH)/ endif - -ifneq ($(CONFIG_DRIVERS_RTL8723DU),) -obj-$(CONFIG_DRIVERS_RTL8723DU) += $(HDF_VENDOR_PREFIX)/out/KERNEL_OBJ/kernel/src_tmp/linux-5.10/drivers/net/wireless/rtl/ -endif -- Gitee