Merge branch 'bugfix/fix_esp32c2_does_not_support_csi_issue' into 'master'

Bugfix/fix esp32c2 does not support csi issue

Closes IDF-4216

See merge request espressif/esp-idf!18595

components/esp_wifi/Kconfig

@@ -124,6 +124,7 @@ menu "Wi-Fi"
 
     config ESP32_WIFI_CSI_ENABLED
         bool "WiFi CSI(Channel State Information)"
+        depends on SOC_WIFI_CSI_SUPPORT
         default n
         help
             Select this option to enable CSI(Channel State Information) feature. CSI takes about

components/soc/esp32/include/soc/Kconfig.soc_caps.in

@@ -686,3 +686,11 @@ config SOC_WIFI_GCMP_SUPPORT
 config SOC_WIFI_WAPI_SUPPORT
     bool
     default y
+
+config SOC_WIFI_CSI_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_MESH_SUPPORT
+    bool
+    default y

components/soc/esp32/include/soc/soc_caps.h

@@ -384,3 +384,5 @@
 #define SOC_WIFI_FTM_SUPPORT            (0)    /*!< FTM is not supported */
 #define SOC_WIFI_GCMP_SUPPORT           (0)    /*!< GCMP is not supported(GCMP128 and GCMP256) */
 #define SOC_WIFI_WAPI_SUPPORT           (1)    /*!< Support WAPI */
+#define SOC_WIFI_CSI_SUPPORT            (1)    /*!< Support CSI */
+#define SOC_WIFI_MESH_SUPPORT           (1)    /*!< Support WIFI MESH */

components/soc/esp32c2/include/soc/Kconfig.soc_caps.in

@@ -561,7 +561,7 @@ config SOC_WIFI_HW_TSF
 
 config SOC_WIFI_FTM_SUPPORT
     bool
-    default y
+    default n
 
 config SOC_WIFI_GCMP_SUPPORT
     bool
@@ -570,3 +570,11 @@ config SOC_WIFI_GCMP_SUPPORT
 config SOC_WIFI_WAPI_SUPPORT
     bool
     default n
+
+config SOC_WIFI_CSI_SUPPORT
+    bool
+    default n
+
+config SOC_WIFI_MESH_SUPPORT
+    bool
+    default n

components/soc/esp32c2/include/soc/soc_caps.h

@@ -280,6 +280,8 @@
 
 /*------------------------------------ WI-FI CAPS ------------------------------------*/
 #define SOC_WIFI_HW_TSF                 (1)    /*!< Support hardware TSF */
-#define SOC_WIFI_FTM_SUPPORT            (1)    /*!< Support FTM */
+#define SOC_WIFI_FTM_SUPPORT            (0)    /*!< FTM is not supported */
 #define SOC_WIFI_GCMP_SUPPORT           (0)    /*!< GCMP is not supported(GCMP128 and GCMP256) */
 #define SOC_WIFI_WAPI_SUPPORT           (0)    /*!< WAPI is not supported */
+#define SOC_WIFI_CSI_SUPPORT            (0)    /*!< CSI is not supported */
+#define SOC_WIFI_MESH_SUPPORT           (0)    /*!< WIFI MESH is not supported */

components/soc/esp32c3/include/soc/Kconfig.soc_caps.in

@@ -766,3 +766,11 @@ config SOC_WIFI_GCMP_SUPPORT
 config SOC_WIFI_WAPI_SUPPORT
     bool
     default y
+
+config SOC_WIFI_CSI_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_MESH_SUPPORT
+    bool
+    default y

components/soc/esp32c3/include/soc/soc_caps.h

@@ -361,3 +361,5 @@
 #define SOC_WIFI_FTM_SUPPORT            (1)    /*!< Support FTM */
 #define SOC_WIFI_GCMP_SUPPORT           (1)    /*!< Support GCMP(GCMP128 and GCMP256) */
 #define SOC_WIFI_WAPI_SUPPORT           (1)    /*!< Support WAPI */
+#define SOC_WIFI_CSI_SUPPORT            (1)    /*!< Support CSI */
+#define SOC_WIFI_MESH_SUPPORT           (1)    /*!< Support WIFI MESH */

components/soc/esp32s2/include/soc/Kconfig.soc_caps.in

@@ -866,3 +866,11 @@ config SOC_WIFI_GCMP_SUPPORT
 config SOC_WIFI_WAPI_SUPPORT
     bool
     default y
+
+config SOC_WIFI_CSI_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_MESH_SUPPORT
+    bool
+    default y

components/soc/esp32s2/include/soc/soc_caps.h

@@ -395,3 +395,5 @@
 #define SOC_WIFI_FTM_SUPPORT            (1)    /*!< Support FTM */
 #define SOC_WIFI_GCMP_SUPPORT           (0)    /*!< GCMP is not supported(GCMP128 and GCMP256) */
 #define SOC_WIFI_WAPI_SUPPORT           (1)    /*!< Support WAPI */
+#define SOC_WIFI_CSI_SUPPORT            (1)    /*!< Support CSI */
+#define SOC_WIFI_MESH_SUPPORT           (1)    /*!< Support WIFI MESH */

components/soc/esp32s3/include/soc/Kconfig.soc_caps.in

@@ -983,6 +983,14 @@ config SOC_WIFI_WAPI_SUPPORT
     bool
     default y
 
+config SOC_WIFI_CSI_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_MESH_SUPPORT
+    bool
+    default y
+
 config SOC_TWAI_BRP_MIN
     int
     default 2

components/soc/esp32s3/include/soc/soc_caps.h

@@ -427,3 +427,5 @@
 #define SOC_WIFI_FTM_SUPPORT            (1)    /*!< Support FTM */
 #define SOC_WIFI_GCMP_SUPPORT           (1)    /*!< Support GCMP(GCMP128 and GCMP256) */
 #define SOC_WIFI_WAPI_SUPPORT           (1)    /*!< Support WAPI */
+#define SOC_WIFI_CSI_SUPPORT            (1)    /*!< Support CSI */
+#define SOC_WIFI_MESH_SUPPORT           (1)    /*!< Support WIFI MESH */

examples/wifi/ftm/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-S2 | ESP32-C3 |
+| Supported Targets | ESP32-S2 | ESP32-C3 | ESP32-S3 |
-| ----------------- | -------- | -------- |
+| ----------------- | -------- | -------- | -------- |
 
 # FTM Example