soc: clean WIFI unsupport soc_caps

espressif · Mar 3, 2023 · 15eb193 · 15eb193
1 parent fd7e8ab
commit 15eb193
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 45 deletions.
diff --git a/components/soc/esp32/include/soc/Kconfig.soc_caps.in b/components/soc/esp32/include/soc/Kconfig.soc_caps.in
@@ -803,14 +803,6 @@ config SOC_SDMMC_NUM_SLOTS
     int
     default 2
 
-config SOC_WIFI_FTM_SUPPORT
-    bool
-    default n
-
-config SOC_WIFI_GCMP_SUPPORT
-    bool
-    default n
-
 config SOC_WIFI_WAPI_SUPPORT
     bool
     default y

diff --git a/components/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h
@@ -401,12 +401,10 @@
 #define SOC_SDMMC_NUM_SLOTS  2
 
 /*-------------------------- WI-FI HARDWARE CAPS -------------------------------*/
-#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 */
-#define SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW   (1)    /*!< Support delta early time for rf phy on/off */
+#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 */
+#define SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW (1)    /*!< Support delta early time for rf phy on/off */
 
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */

diff --git a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
@@ -647,26 +647,6 @@ config SOC_WIFI_HW_TSF
     bool
     default y
 
-config SOC_WIFI_FTM_SUPPORT
-    bool
-    default n
-
-config SOC_WIFI_GCMP_SUPPORT
-    bool
-    default n
-
-config SOC_WIFI_WAPI_SUPPORT
-    bool
-    default n
-
-config SOC_WIFI_CSI_SUPPORT
-    bool
-    default n
-
-config SOC_WIFI_MESH_SUPPORT
-    bool
-    default n
-
 config SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW
     bool
     default y

diff --git a/components/soc/esp32c2/include/soc/soc_caps.h b/components/soc/esp32c2/include/soc/soc_caps.h
@@ -301,12 +301,7 @@
 #define SOC_CLK_OSC_SLOW_SUPPORTED                (1)     /*!< ESP32C2 only supports to connect an external oscillator, not a crystal */
 
 /*------------------------------------ WI-FI CAPS ------------------------------------*/
-#define SOC_WIFI_HW_TSF                     (1)    /*!< Support hardware TSF */
-#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 */
+#define SOC_WIFI_HW_TSF                           (1)    /*!< Support hardware TSF */
 #define SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW   (1)    /*!< Support delta early time for rf phy on/off */
 
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/

diff --git a/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
@@ -1051,10 +1051,6 @@ config SOC_WIFI_FTM_SUPPORT
     bool
     default y
 
-config SOC_WIFI_GCMP_SUPPORT
-    bool
-    default n
-
 config SOC_WIFI_WAPI_SUPPORT
     bool
     default y

diff --git a/components/soc/esp32s2/include/soc/soc_caps.h b/components/soc/esp32s2/include/soc/soc_caps.h
@@ -454,7 +454,6 @@
 /*------------------------------------ WI-FI CAPS ------------------------------------*/
 #define SOC_WIFI_HW_TSF                     (1)    /*!< Support hardware TSF */
 #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 */