espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 13:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_esp32c2_dose_not_support_wapi' into 'master'

Browse Source 
esp_wifi: esp32c2 does not support wapi

Closes IDF-4216

See merge request espressif/esp-idf!18573
This commit is contained in:
morris
2022-06-20 21:31:54 +08:00
parent cce48ded57 2ccce0ca41
commit 865937fba3
11 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/soc/esp32/include/soc/Kconfig.soc_caps.in
View File

@@ -682,3 +682,7 @@ config SOC_WIFI_FTM_SUPPORT
config SOC_WIFI_GCMP_SUPPORT config SOC_WIFI_GCMP_SUPPORT
bool bool
default n default n
config SOC_WIFI_WAPI_SUPPORT
bool
default y

7
components/soc/esp32/include/soc/soc_caps.h
View File

@@ -380,6 +380,7 @@
#define SOC_BLE_DONT_UPDATE_OWN_RPA (1) #define SOC_BLE_DONT_UPDATE_OWN_RPA (1)
/*-------------------------- WI-FI HARDWARE CAPS -------------------------------*/ /*-------------------------- WI-FI HARDWARE CAPS -------------------------------*/
#define SOC_WIFI_HW_TSF (0) /*!< Support hardware TSF */ #define SOC_WIFI_HW_TSF (0) /*!< Hardware TSF is not supported */
#define SOC_WIFI_FTM_SUPPORT (0) /*!< FTM Support */ #define SOC_WIFI_FTM_SUPPORT (0) /*!< FTM is not supported */
#define SOC_WIFI_GCMP_SUPPORT (0) /*!< GCMP Support(GCMP128 and GCMP256) */ #define SOC_WIFI_GCMP_SUPPORT (0) /*!< GCMP is not supported(GCMP128 and GCMP256) */
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */

4
components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
View File

@@ -566,3 +566,7 @@ config SOC_WIFI_FTM_SUPPORT
config SOC_WIFI_GCMP_SUPPORT config SOC_WIFI_GCMP_SUPPORT
bool bool
default n default n
config SOC_WIFI_WAPI_SUPPORT
bool
default n

5
components/soc/esp32c2/include/soc/soc_caps.h
View File

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

4
components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
View File

@@ -762,3 +762,7 @@ config SOC_WIFI_FTM_SUPPORT
config SOC_WIFI_GCMP_SUPPORT config SOC_WIFI_GCMP_SUPPORT
bool bool
default y default y
config SOC_WIFI_WAPI_SUPPORT
bool
default y

5
components/soc/esp32c3/include/soc/soc_caps.h
View File

@@ -358,5 +358,6 @@
/*------------------------------------ WI-FI CAPS ------------------------------------*/ /*------------------------------------ WI-FI CAPS ------------------------------------*/
#define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */ #define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */
#define SOC_WIFI_FTM_SUPPORT (1) /*!< FTM Support */ #define SOC_WIFI_FTM_SUPPORT (1) /*!< Support FTM */
#define SOC_WIFI_GCMP_SUPPORT (1) /*!< GCMP Support(GCMP128 and GCMP256) */ #define SOC_WIFI_GCMP_SUPPORT (1) /*!< Support GCMP(GCMP128 and GCMP256) */
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */

4
components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
View File

@@ -862,3 +862,7 @@ config SOC_WIFI_FTM_SUPPORT
config SOC_WIFI_GCMP_SUPPORT config SOC_WIFI_GCMP_SUPPORT
bool bool
default n default n
config SOC_WIFI_WAPI_SUPPORT
bool
default y

5
components/soc/esp32s2/include/soc/soc_caps.h
View File

@@ -392,5 +392,6 @@
/*------------------------------------ WI-FI CAPS ------------------------------------*/ /*------------------------------------ WI-FI CAPS ------------------------------------*/
#define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */ #define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */
#define SOC_WIFI_FTM_SUPPORT (1) /*!< FTM Support */ #define SOC_WIFI_FTM_SUPPORT (1) /*!< Support FTM */
#define SOC_WIFI_GCMP_SUPPORT (0) /*!< GCMP Support(GCMP128 and GCMP256) */ #define SOC_WIFI_GCMP_SUPPORT (0) /*!< GCMP is not supported(GCMP128 and GCMP256) */
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */

4
components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
View File

@@ -979,6 +979,10 @@ config SOC_WIFI_GCMP_SUPPORT
bool bool
default y default y
config SOC_WIFI_WAPI_SUPPORT
bool
default y
config SOC_TWAI_BRP_MIN config SOC_TWAI_BRP_MIN
int int
default 2 default 2

5
components/soc/esp32s3/include/soc/soc_caps.h
View File

@@ -424,5 +424,6 @@
/*------------------------------------ WI-FI CAPS ------------------------------------*/ /*------------------------------------ WI-FI CAPS ------------------------------------*/
#define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */ #define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */
#define SOC_WIFI_FTM_SUPPORT (1) /*!< FTM Support */ #define SOC_WIFI_FTM_SUPPORT (1) /*!< Support FTM */
#define SOC_WIFI_GCMP_SUPPORT (1) /*!< GCMP Support(GCMP128 and GCMP256) */ #define SOC_WIFI_GCMP_SUPPORT (1) /*!< Support GCMP(GCMP128 and GCMP256) */
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */

1
components/wpa_supplicant/Kconfig
View File

@@ -26,6 +26,7 @@ menu "Supplicant"
config WPA_WAPI_PSK config WPA_WAPI_PSK
bool "Enable WAPI PSK support" bool "Enable WAPI PSK support"
depends on SOC_WIFI_WAPI_SUPPORT
default n default n
help help
Select this option to enable WAPI-PSK Select this option to enable WAPI-PSK