esp_wifi: optimize wifi kconfig

2025-08-08 15:14:33 +02:00 · 2022-05-10 04:00:01 -04:00
parent e0decf4839
commit 7b9b448041
14 changed files with 93 additions and 42 deletions
--- a/components/esp_netif/test_apps/README.md
+++ b/components/esp_netif/test_apps/README.md
@@ -1,4 +1,2 @@
-| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 |
-| ----------------- | ----- | -------- | -------- | -------- |
-
-Not support on ESP32-C2 yet, waiting esp_wifi supported. TODO: IDF-3905
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | ESP32-C2 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
--- a/components/esp_wifi/Kconfig
+++ b/components/esp_wifi/Kconfig
@@ -281,7 +281,7 @@ menu "Wi-Fi"
    config ESP_WIFI_FTM_ENABLE
        bool "WiFi FTM"
        default n
-        depends on (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C2)
+        depends on SOC_WIFI_FTM_SUPPORT
        help
            Enable feature Fine Timing Measurement for calculating WiFi Round-Trip-Time (RTT).

@@ -316,7 +316,7 @@ menu "Wi-Fi"
    config ESP_WIFI_GCMP_SUPPORT
        bool "WiFi GCMP Support(GCMP128 and GCMP256)"
        default n
-        depends on (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3)
+        depends on SOC_WIFI_GCMP_SUPPORT
        help
            Select this option to enable GCMP support. GCMP support is compulsory for WiFi Suite-B support.

--- a/components/soc/esp32/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32/include/soc/Kconfig.soc_caps.in
@@ -654,3 +654,15 @@ config SOC_SDMMC_NUM_SLOTS
 config SOC_BLE_DONT_UPDATE_OWN_RPA
    bool
    default y
+
+config SOC_WIFI_HW_TSF
+    bool
+    default n
+
+config SOC_WIFI_FTM_SUPPORT
+    bool
+    default n
+
+config SOC_WIFI_GCMP_SUPPORT
+    bool
+    default n
--- a/components/soc/esp32/include/soc/soc_caps.h
+++ b/components/soc/esp32/include/soc/soc_caps.h
@@ -370,3 +370,8 @@

 /*------------------------------ BLE --------------------------------------------*/
 #define SOC_BLE_DONT_UPDATE_OWN_RPA  (1)
+
+/*-------------------------- WI-FI HARDWARE CAPS -------------------------------*/
+#define SOC_WIFI_HW_TSF                 (0)    /*!< Support hardware TSF */
+#define SOC_WIFI_FTM_SUPPORT            (0)    /*!< FTM Support */
+#define SOC_WIFI_GCMP_SUPPORT           (0)    /*!< GCMP Support(GCMP128 and GCMP256) */
--- a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
@@ -499,10 +499,6 @@ config SOC_UART_SUPPORT_FSM_TX_WAIT_SEND
    bool
    default y

-config SOC_WIFI_HW_TSF
-    bool
-    default y
-
 config SOC_COEX_HW_PTI
    bool
    default y
@@ -538,3 +534,15 @@ config SOC_PM_SUPPORT_WIFI_PD
 config SOC_PM_SUPPORT_BT_PD
    bool
    default n
+
+config SOC_WIFI_HW_TSF
+    bool
+    default y
+
+config SOC_WIFI_FTM_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_GCMP_SUPPORT
+    bool
+    default n
--- a/components/soc/esp32c2/include/soc/soc_caps.h
+++ b/components/soc/esp32c2/include/soc/soc_caps.h
@@ -251,9 +251,6 @@
 // UART has an extra TX_WAIT_SEND state when the FIFO is not empty and XOFF is enabled
 #define SOC_UART_SUPPORT_FSM_TX_WAIT_SEND   (1)

-/*-------------------------- WI-FI HARDWARE TSF CAPS -------------------------------*/
-#define SOC_WIFI_HW_TSF                 (1)
-
 /*-------------------------- COEXISTENCE HARDWARE PTI CAPS -------------------------------*/
 #define SOC_COEX_HW_PTI                 (1)

@@ -274,3 +271,8 @@
 #define SOC_PM_SUPPORT_WIFI_PD          (0)

 #define SOC_PM_SUPPORT_BT_PD            (0)
+
+/*------------------------------------ WI-FI CAPS ------------------------------------*/
+#define SOC_WIFI_HW_TSF                 (1)    /*!< Support hardware TSF */
+#define SOC_WIFI_FTM_SUPPORT            (1)    /*!< FTM Support */
+#define SOC_WIFI_GCMP_SUPPORT           (0)    /*!< GCMP Support(GCMP128 and GCMP256) */
--- a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
@@ -699,10 +699,6 @@ config SOC_UART_SUPPORT_FSM_TX_WAIT_SEND
    bool
    default y

-config SOC_WIFI_HW_TSF
-    bool
-    default y
-
 config SOC_COEX_HW_PTI
    bool
    default y
@@ -746,3 +742,15 @@ config SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC
 config SOC_TEMPERATURE_SENSOR_SUPPORT_XTAL
    bool
    default y
+
+config SOC_WIFI_HW_TSF
+    bool
+    default y
+
+config SOC_WIFI_FTM_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_GCMP_SUPPORT
+    bool
+    default y
--- a/components/soc/esp32c3/include/soc/soc_caps.h
+++ b/components/soc/esp32c3/include/soc/soc_caps.h
@@ -329,9 +329,6 @@
 // UART has an extra TX_WAIT_SEND state when the FIFO is not empty and XOFF is enabled
 #define SOC_UART_SUPPORT_FSM_TX_WAIT_SEND   (1)

-/*-------------------------- WI-FI HARDWARE TSF CAPS -------------------------------*/
-#define SOC_WIFI_HW_TSF                 (1)
-
 /*-------------------------- COEXISTENCE HARDWARE PTI CAPS -------------------------------*/
 #define SOC_COEX_HW_PTI                 (1)

@@ -356,3 +353,8 @@
 /*-------------------------- Temperature Sensor CAPS -------------------------------------*/
 #define SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC                (1)
 #define SOC_TEMPERATURE_SENSOR_SUPPORT_XTAL                (1)
+
+/*------------------------------------ WI-FI CAPS ------------------------------------*/
+#define SOC_WIFI_HW_TSF                 (1)    /*!< Support hardware TSF */
+#define SOC_WIFI_FTM_SUPPORT            (1)    /*!< FTM Support */
+#define SOC_WIFI_GCMP_SUPPORT           (1)    /*!< GCMP Support(GCMP128 and GCMP256) */
--- a/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
@@ -783,10 +783,6 @@ config SOC_AES_SUPPORT_AES_256
    bool
    default y

-config SOC_WIFI_HW_TSF
-    bool
-    default y
-
 config SOC_PHY_DIG_REGS_MEM_SIZE
    int
    default 21
@@ -834,3 +830,15 @@ config SOC_COEX_HW_PTI
 config SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC
    bool
    default y
+
+config SOC_WIFI_HW_TSF
+    bool
+    default y
+
+config SOC_WIFI_FTM_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_GCMP_SUPPORT
+    bool
+    default n
--- a/components/soc/esp32s2/include/soc/soc_caps.h
+++ b/components/soc/esp32s2/include/soc/soc_caps.h
@@ -359,9 +359,6 @@
 #define SOC_AES_SUPPORT_AES_192 (1)
 #define SOC_AES_SUPPORT_AES_256 (1)

-/*-------------------------- WI-FI HARDWARE TSF CAPS -------------------------------*/
-#define SOC_WIFI_HW_TSF                 (1)
-
 /*--------------- PHY REGISTER AND MEMORY SIZE CAPS --------------------------*/
 #define SOC_PHY_DIG_REGS_MEM_SIZE       (21*4)

@@ -390,3 +387,8 @@

 /*-------------------------- Temperature Sensor CAPS -------------------------------------*/
 #define SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC                (1)
+
+/*------------------------------------ WI-FI CAPS ------------------------------------*/
+#define SOC_WIFI_HW_TSF                 (1)    /*!< Support hardware TSF */
+#define SOC_WIFI_FTM_SUPPORT            (1)    /*!< FTM Support */
+#define SOC_WIFI_GCMP_SUPPORT           (0)    /*!< GCMP Support(GCMP128 and GCMP256) */
--- a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
@@ -907,10 +907,6 @@ config SOC_FLASH_ENCRYPTION_XTS_AES_256
    bool
    default y

-config SOC_WIFI_HW_TSF
-    bool
-    default y
-
 config SOC_PHY_DIG_REGS_MEM_SIZE
    int
    default 21
@@ -967,6 +963,18 @@ config SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC
    bool
    default y

+config SOC_WIFI_HW_TSF
+    bool
+    default y
+
+config SOC_WIFI_FTM_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_GCMP_SUPPORT
+    bool
+    default y
+
 config SOC_TWAI_BRP_MIN
    int
    default 2
--- a/components/soc/esp32s3/include/soc/soc_caps.h
+++ b/components/soc/esp32s3/include/soc/soc_caps.h
@@ -386,9 +386,6 @@
 #define SOC_FLASH_ENCRYPTION_XTS_AES_128    1
 #define SOC_FLASH_ENCRYPTION_XTS_AES_256    1

-/*-------------------------- WI-FI HARDWARE TSF CAPS -------------------------------*/
-#define SOC_WIFI_HW_TSF                 (1)
-
 /*--------------- PHY REGISTER AND MEMORY SIZE CAPS --------------------------*/
 #define SOC_PHY_DIG_REGS_MEM_SIZE       (21*4)
 #define SOC_MAC_BB_PD_MEM_SIZE          (192*4)
@@ -419,3 +416,8 @@

 /*-------------------------- Temperature Sensor CAPS -------------------------------------*/
 #define SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC                (1)
+
+/*------------------------------------ WI-FI CAPS ------------------------------------*/
+#define SOC_WIFI_HW_TSF                 (1)    /*!< Support hardware TSF */
+#define SOC_WIFI_FTM_SUPPORT            (1)    /*!< FTM Support */
+#define SOC_WIFI_GCMP_SUPPORT           (1)    /*!< GCMP Support(GCMP128 and GCMP256) */
--- a/tools/test_apps/phy/phy_multi_init_data_test/README.md
+++ b/tools/test_apps/phy/phy_multi_init_data_test/README.md
@@ -1,4 +1,2 @@
-| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 |
-| ----------------- | ----- | -------- | -------- | -------- |
-
-Not support on ESP32-C2 yet, waiting esp_wifi supported. TODO: IDF-3905
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | ESP32-C2 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
--- a/tools/test_apps/protocols/mqtt/build_test/README.md
+++ b/tools/test_apps/protocols/mqtt/build_test/README.md
@@ -1,7 +1,5 @@
-| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 |
-| ----------------- | ----- | -------- | -------- | -------- |
-
-Not support on ESP32-C2 yet, waiting esp_wifi supported. TODO: IDF-3905
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | ESP32-C2 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |

 # Build only test for C++