qcacld-3.0: Add peach HAL file support

Add peach HAL file support.

Change-Id: I47d9363edff2a46b774fa15b784a803fa22c3936
CRs-Fixed: 3674721

Kbuild

@@ -3009,11 +3009,14 @@ 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 (y,$(findstring y,$(CONFIG_CNSS_KIWI) $(CONFIG_CNSS_KIWI_V2) $(CONFIG_CNSS_PEACH)))
+ifeq (y,$(findstring y,$(CONFIG_INCLUDE_HAL_PEACH)))
+HAL_INC += -I$(WLAN_COMMON_INC)/$(HAL_DIR)/wifi3.0/peach
+HAL_OBJS += $(WLAN_COMMON_ROOT)/$(HAL_DIR)/wifi3.0/peach/hal_peach.o
+ccflags-y += -DINCLUDE_HAL_PEACH
+else ifeq (y,$(findstring y,$(CONFIG_INCLUDE_HAL_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
-else
-#error "Not Beryllium"
+ccflags-y += -DINCLUDE_HAL_KIWI
 endif
 
 endif #### CONFIG_BERYLLIUM ####

Kconfig

@@ -120,6 +120,14 @@ config CNSS_PEACH
 	bool "Enable CNSS_PEACH"
 	default n
 
+config INCLUDE_HAL_KIWI
+	bool "Enable INCLUDE_HAL_KIWI"
+	default n
+
+config INCLUDE_HAL_PEACH
+	bool "Enable INCLUDE_HAL_PEACH"
+	default n
+
 config CNSS_UTILS_MODULE
 	bool "Enable CNSS_UTILS_MODULE"
 	default n

configs/config_to_feature.h

@@ -1540,6 +1540,14 @@
 #define QCA_WIFI_PEACH (1)
 #endif
 
+#ifdef CONFIG_INCLUDE_HAL_KIWI
+#define INCLUDE_HAL_KIWI (1)
+#endif
+
+#ifdef CONFIG_INCLUDE_HAL_PEACH
+#define INCLUDE_HAL_PEACH (1)
+#endif
+
 #ifdef CONFIG_QCA_WIFI_QCA8074
 #define QCA_WIFI_QCA8074 (1)
 #endif

configs/kiwi_defconfig

@@ -1,4 +1,5 @@
 CONFIG_CNSS_KIWI := y
+CONFIG_INCLUDE_HAL_KIWI := y
 
 include $(WLAN_ROOT)/configs/default_defconfig
 

configs/kiwi_v2_defconfig

@@ -1,5 +1,6 @@
 CONFIG_CNSS_KIWI := y
 CONFIG_CNSS_KIWI_V2 := y
+CONFIG_INCLUDE_HAL_KIWI := y
 
 ifeq ($(CONFIG_ARCH_SDXPINN), y)
 CONFIG_MOBILE_ROUTER := y

configs/mango_defconfig

@@ -1,6 +1,7 @@
 CONFIG_CNSS_KIWI := y
 CONFIG_CNSS_KIWI_V2 := y
 CONFIG_CNSS_MANGO := y
+CONFIG_INCLUDE_HAL_KIWI := y
 
 include $(WLAN_ROOT)/configs/default_defconfig
 

configs/niobe_gki_kiwi-v2_defconfig

@@ -17,6 +17,7 @@ CONFIG_CHIP_VERSION=2
 CONFIG_CNSS_GENL_MODULE=y
 CONFIG_CNSS_KIWI=y
 CONFIG_CNSS_KIWI_V2=y
+CONFIG_INCLUDE_HAL_KIWI=y
 CONFIG_CNSS_UTILS_MODULE=y
 CONFIG_CNSS_UTILS=y
 CONFIG_CONNECTIVITY_PKTLOG=y

configs/peach_defconfig

@@ -1,6 +1,7 @@
 CONFIG_CNSS_PEACH := y
 CONFIG_CNSS_KIWI := y
 CONFIG_CNSS_KIWI_V2 := y
+CONFIG_INCLUDE_HAL_PEACH := y
 
 #Enable 11BE EHT
 CONFIG_WLAN_FEATURE_11BE := y

configs/pineapple_gki_kiwi-v2_defconfig

@@ -17,6 +17,7 @@ CONFIG_CHIP_VERSION=2
 CONFIG_CNSS_GENL_MODULE=y
 CONFIG_CNSS_KIWI=y
 CONFIG_CNSS_KIWI_V2=y
+CONFIG_INCLUDE_HAL_KIWI=y
 CONFIG_CNSS_UTILS_MODULE=y
 CONFIG_CNSS_UTILS=y
 CONFIG_CONNECTIVITY_PKTLOG=y

configs/pineapple_gki_peach_defconfig

@@ -18,6 +18,7 @@ CONFIG_CNSS_GENL_MODULE=y
 CONFIG_CNSS_KIWI=y
 CONFIG_CNSS_KIWI_V2=y
 CONFIG_CNSS_PEACH=y
+CONFIG_INCLUDE_HAL_PEACH=y
 CONFIG_CNSS_UTILS_MODULE=y
 CONFIG_CNSS_UTILS=y
 CONFIG_CONNECTIVITY_PKTLOG=y

configs/sun_gki_kiwi-v2_defconfig

@@ -17,6 +17,7 @@ CONFIG_CHIP_VERSION=2
 CONFIG_CNSS_GENL_MODULE=y
 CONFIG_CNSS_KIWI=y
 CONFIG_CNSS_KIWI_V2=y
+CONFIG_INCLUDE_HAL_KIWI=y
 CONFIG_CNSS_UTILS_MODULE=y
 CONFIG_CNSS_UTILS=y
 CONFIG_CONNECTIVITY_PKTLOG=y

configs/sun_gki_peach_defconfig

@@ -18,6 +18,7 @@ CONFIG_CNSS_GENL_MODULE=y
 CONFIG_CNSS_KIWI=y
 CONFIG_CNSS_KIWI_V2=y
 CONFIG_CNSS_PEACH=y
+CONFIG_INCLUDE_HAL_PEACH=y
 CONFIG_CNSS_UTILS_MODULE=y
 CONFIG_CNSS_UTILS=y
 CONFIG_CONNECTIVITY_PKTLOG=y

wlan_qcacld3_modules.bzl

@@ -35,7 +35,7 @@ _chipset_hw_map = {
 _chipset_header_map = {
     "peach": [
         "api/hw/peach/v1",
-        "cmn/hal/wifi3.0/kiwi",
+        "cmn/hal/wifi3.0/peach",
     ],
     "kiwi-v2": [
         "api/hw/kiwi/v2",
@@ -694,19 +694,23 @@ _conditional_srcs = {
     },
     "CONFIG_CNSS_KIWI_V2": {
         True: [
-            "cmn/hal/wifi3.0/kiwi/hal_kiwi.c",
             "cmn/hif/src/kiwidef.c",
         ],
     },
-    "CONFIG_QCA6750_HEADERS_DEF": {
+    "CONFIG_INCLUDE_HAL_KIWI": {
         True: [
-            "cmn/hal/wifi3.0/qca6750/hal_6750.c",
-            "cmn/hif/src/qca6750def.c",
+            "cmn/hal/wifi3.0/kiwi/hal_kiwi.c",
         ],
     },
-    "CONFIG_CNSS_PEACH": {
+    "CONFIG_INCLUDE_HAL_PEACH": {
         True: [
-            "cmn/hal/wifi3.0/kiwi/hal_kiwi.c",
+            "cmn/hal/wifi3.0/peach/hal_peach.c",
+        ],
+    },
+    "CONFIG_QCA6750_HEADERS_DEF": {
+        True: [
+            "cmn/hal/wifi3.0/qca6750/hal_6750.c",
+            "cmn/hif/src/qca6750def.c",
         ],
     },
     "CONFIG_CP_STATS": {