qcacld-3.0: Build configuration changes for kiwi v2 hw files

Changes to build for kiwi v2 hw files.

Change-Id: Ic32408256fb5d96ee580d8e12573c422401bf6cd
CRs-Fixed: 3122914
This commit is contained in:
Srinivas Girigowda
2022-01-18 19:41:44 -08:00
committed by Madan Koyyalamudi
parent 5b3e15e2d0
commit 94762ba42a
4 changed files with 27 additions and 5 deletions

1
.kiwi_v2 Symbolic link
View File

@@ -0,0 +1 @@
.

9
Kbuild
View File

@@ -2564,7 +2564,7 @@ endif
HIF_CE_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_service_srng.o HIF_CE_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_service_srng.o
else ifeq ($(CONFIG_BERYLLIUM), y) else ifeq ($(CONFIG_BERYLLIUM), y)
ifeq ($(CONFIG_CNSS_KIWI), y) ifeq (y,$(findstring y,$(CONFIG_CNSS_KIWI) $(CONFIG_CNSS_KIWI_V2)))
HIF_CE_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/kiwidef.o HIF_CE_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/kiwidef.o
endif endif
@@ -2692,7 +2692,7 @@ HAL_OBJS += $(WLAN_COMMON_ROOT)/$(HAL_DIR)/wifi3.0/be/hal_be_generic_api.o
HAL_OBJS += $(WLAN_COMMON_ROOT)/$(HAL_DIR)/wifi3.0/be/hal_be_reo.o \ HAL_OBJS += $(WLAN_COMMON_ROOT)/$(HAL_DIR)/wifi3.0/be/hal_be_reo.o \
ifeq ($(CONFIG_CNSS_KIWI), y) ifeq (y,$(findstring y,$(CONFIG_CNSS_KIWI) $(CONFIG_CNSS_KIWI_V2)))
HAL_INC += -I$(WLAN_COMMON_INC)/$(HAL_DIR)/wifi3.0/kiwi HAL_INC += -I$(WLAN_COMMON_INC)/$(HAL_DIR)/wifi3.0/kiwi
HAL_OBJS += $(WLAN_COMMON_ROOT)/$(HAL_DIR)/wifi3.0/kiwi/hal_kiwi.o HAL_OBJS += $(WLAN_COMMON_ROOT)/$(HAL_DIR)/wifi3.0/kiwi/hal_kiwi.o
else else
@@ -2824,9 +2824,13 @@ ifeq ($(CONFIG_CNSS_QCA6750), y)
TARGET_INC += -I$(WLAN_FW_API)/hw/qca6750/v1 TARGET_INC += -I$(WLAN_FW_API)/hw/qca6750/v1
endif endif
ifeq ($(CONFIG_CNSS_KIWI_V2), y)
TARGET_INC += -I$(WLAN_FW_API)/hw/kiwi/v2/
else
ifeq ($(CONFIG_CNSS_KIWI), y) ifeq ($(CONFIG_CNSS_KIWI), y)
TARGET_INC += -I$(WLAN_FW_API)/hw/kiwi/v1/ TARGET_INC += -I$(WLAN_FW_API)/hw/kiwi/v1/
endif endif
endif
LINUX_INC := -Iinclude LINUX_INC := -Iinclude
@@ -3722,6 +3726,7 @@ cppflags-$(CONFIG_KIWI_HEADERS_DEF) += -DKIWI_HEADERS_DEF
cppflags-$(CONFIG_QCA_WIFI_QCA6490) += -DQCA_WIFI_QCA6490 cppflags-$(CONFIG_QCA_WIFI_QCA6490) += -DQCA_WIFI_QCA6490
cppflags-$(CONFIG_QCA_WIFI_QCA6750) += -DQCA_WIFI_QCA6750 cppflags-$(CONFIG_QCA_WIFI_QCA6750) += -DQCA_WIFI_QCA6750
cppflags-$(CONFIG_QCA_WIFI_KIWI) += -DQCA_WIFI_KIWI cppflags-$(CONFIG_QCA_WIFI_KIWI) += -DQCA_WIFI_KIWI
cppflags-$(CONFIG_CNSS_KIWI_V2) += -DQCA_WIFI_KIWI_V2
cppflags-$(CONFIG_QCA_WIFI_QCA8074) += -DQCA_WIFI_QCA8074 cppflags-$(CONFIG_QCA_WIFI_QCA8074) += -DQCA_WIFI_QCA8074
cppflags-$(CONFIG_SCALE_INCLUDES) += -DSCALE_INCLUDES cppflags-$(CONFIG_SCALE_INCLUDES) += -DSCALE_INCLUDES
cppflags-$(CONFIG_QCA_WIFI_QCA8074_VP) += -DQCA_WIFI_QCA8074_VP cppflags-$(CONFIG_QCA_WIFI_QCA8074_VP) += -DQCA_WIFI_QCA8074_VP

View File

@@ -89,7 +89,7 @@ ifeq ($(CONFIG_CNSS_QCA6750), y)
CONFIG_TX_MULTI_TCL := y CONFIG_TX_MULTI_TCL := y
endif endif
ifeq ($(CONFIG_CNSS_KIWI), y) ifeq (y,$(findstring y,$(CONFIG_CNSS_KIWI) $(CONFIG_CNSS_KIWI_V2)))
ifeq ($(CONFIG_CNSS_EMULATION), y) ifeq ($(CONFIG_CNSS_EMULATION), y)
CONFIG_QCA_WIFI_EMULATION := y CONFIG_QCA_WIFI_EMULATION := y
endif endif
@@ -649,7 +649,7 @@ ifeq ($(CONFIG_CNSS_QCA6750), y)
CONFIG_BUS_AUTO_SUSPEND := y CONFIG_BUS_AUTO_SUSPEND := y
endif endif
ifeq ($(CONFIG_CNSS_KIWI), y) ifeq (y,$(findstring y,$(CONFIG_CNSS_KIWI) $(CONFIG_CNSS_KIWI_V2)))
CONFIG_KIWI_HEADERS_DEF := y CONFIG_KIWI_HEADERS_DEF := y
CONFIG_QCA_WIFI_KIWI := y CONFIG_QCA_WIFI_KIWI := y
endif endif
@@ -1397,7 +1397,7 @@ CONFIG_MORE_TX_DESC := y
endif endif
ifeq ($(CONFIG_CNSS_KIWI), y) ifeq (y,$(findstring y,$(CONFIG_CNSS_KIWI) $(CONFIG_CNSS_KIWI_V2)))
#Enable 6 GHz Band #Enable 6 GHz Band
CONFIG_BAND_6GHZ := y CONFIG_BAND_6GHZ := y
CONFIG_RX_FISA := y CONFIG_RX_FISA := y

16
configs/kiwi_v2_defconfig Normal file
View File

@@ -0,0 +1,16 @@
CONFIG_CNSS_KIWI := y
CONFIG_CNSS_KIWI_V2 := y
include $(WLAN_ROOT)/configs/default_defconfig
#Enable 11BE EHT
CONFIG_WLAN_FEATURE_11BE := y
# Max Sta Vdev Config
CONFIG_CFG_MAX_STA_VDEVS := 4
#Enable 11BE MLO
CONFIG_WLAN_FEATURE_11BE_MLO := y
#BMISS offload max vdev config
CONFIG_CFG_BMISS_OFFLOAD_MAX_VDEV := 4