Merge branch 'bugfix/fix_esp32h2_apb_frequency_temp_fix' into 'master'

[bugfix] esp32h2: fix apb freq err temporarily

See merge request espressif/esp-idf!14982
This commit is contained in:
Shu Chen 2021-08-30 00:16:45 +00:00
commit ec31f2338b
2 changed files with 4 additions and 1 deletions

View File

@ -10,10 +10,13 @@ menu "ESP32H2-Specific"
config ESP32H2_DEFAULT_CPU_FREQ_16 config ESP32H2_DEFAULT_CPU_FREQ_16
bool "16 MHz" bool "16 MHz"
depends on IDF_ENV_FPGA #ESP32H2-TODO: IDF-3786
config ESP32H2_DEFAULT_CPU_FREQ_32 config ESP32H2_DEFAULT_CPU_FREQ_32
bool "32 MHz" bool "32 MHz"
depends on IDF_ENV_FPGA #ESP32H2-TODO: IDF-3786
config ESP32H2_DEFAULT_CPU_FREQ_64 config ESP32H2_DEFAULT_CPU_FREQ_64
bool "64 MHz" bool "64 MHz"
depends on IDF_ENV_FPGA #ESP32H2-TODO: IDF-3786
config ESP32H2_DEFAULT_CPU_FREQ_96 config ESP32H2_DEFAULT_CPU_FREQ_96
bool "96 MHz" bool "96 MHz"
depends on !IDF_ENV_FPGA depends on !IDF_ENV_FPGA

View File

@ -228,7 +228,7 @@
#if CONFIG_IDF_ENV_FPGA #if CONFIG_IDF_ENV_FPGA
#define APB_CLK_FREQ ( 32*1000000 ) #define APB_CLK_FREQ ( 32*1000000 )
#else #else
#define APB_CLK_FREQ ( 96*1000000 ) #define APB_CLK_FREQ ( 48*1000000 ) //ESP32H2-TODO: IDF-3786
#endif #endif
#define REF_CLK_FREQ ( 1000000 ) #define REF_CLK_FREQ ( 1000000 )
#define RTC_CLK_FREQ (17.5*1000000) #define RTC_CLK_FREQ (17.5*1000000)