Merge branch 'bugfix/phy_calib_data_to_nvs_for_c3_s3' into 'master'

esp_wifi: support phy calibration data to nvs for s2 c3 & s3

See merge request espressif/esp-idf!13624
This commit is contained in:
Jiang Jiang Jian
2021-05-25 14:19:43 +00:00
2 changed files with 2 additions and 3 deletions

View File

@@ -376,9 +376,6 @@ endmenu # Wi-Fi
menu "PHY" menu "PHY"
config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
# ToDo: remove target dependency once NVS and PHY partial calibration are supported
# also re-enable the <RF_calibration> entry in docs/../api-guides/index.rst
depends on IDF_TARGET_ESP32
bool "Store phy calibration data in NVS" bool "Store phy calibration data in NVS"
default y default y
help help

View File

@@ -40,9 +40,11 @@
#elif CONFIG_IDF_TARGET_ESP32S2 #elif CONFIG_IDF_TARGET_ESP32S2
#include "esp32s2/rom/rtc.h" #include "esp32s2/rom/rtc.h"
#elif CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32C3
#include "esp32c3/rom/rtc.h"
#include "soc/rtc_cntl_reg.h" #include "soc/rtc_cntl_reg.h"
#include "soc/syscon_reg.h" #include "soc/syscon_reg.h"
#elif CONFIG_IDF_TARGET_ESP32S3 #elif CONFIG_IDF_TARGET_ESP32S3
#include "esp32s3/rom/rtc.h"
#include "soc/rtc_cntl_reg.h" #include "soc/rtc_cntl_reg.h"
#include "soc/syscon_reg.h" #include "soc/syscon_reg.h"
#endif #endif