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

.kiwi_v2

@@ -0,0 +1 @@
+.

Kbuild

@@ -2564,7 +2564,7 @@ endif
 
 HIF_CE_OBJS +=  $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_service_srng.o
 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
 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 \
 
-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_OBJS += $(WLAN_COMMON_ROOT)/$(HAL_DIR)/wifi3.0/kiwi/hal_kiwi.o
 else
@@ -2824,9 +2824,13 @@ ifeq ($(CONFIG_CNSS_QCA6750), y)
 TARGET_INC +=	-I$(WLAN_FW_API)/hw/qca6750/v1
 endif
 
+ifeq ($(CONFIG_CNSS_KIWI_V2), y)
+TARGET_INC +=	-I$(WLAN_FW_API)/hw/kiwi/v2/
+else
 ifeq ($(CONFIG_CNSS_KIWI), y)
 TARGET_INC +=	-I$(WLAN_FW_API)/hw/kiwi/v1/
 endif
+endif
 
 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_QCA6750) += -DQCA_WIFI_QCA6750
 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_SCALE_INCLUDES) += -DSCALE_INCLUDES
 cppflags-$(CONFIG_QCA_WIFI_QCA8074_VP) += -DQCA_WIFI_QCA8074_VP

configs/default_defconfig

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

configs/kiwi_v2_defconfig

@@ -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