IDF release/v5.4 (#11406)
* fix(build): Update APB frequency set routine * IDF release/v5.4 aed8bdc8
This commit is contained in:
parent
72a582b908
commit
f3ae2a65e2
2 changed files with 44 additions and 34 deletions
|
|
@ -26,6 +26,8 @@
|
|||
#include "soc/efuse_reg.h"
|
||||
#include "esp32-hal.h"
|
||||
#include "esp32-hal-cpu.h"
|
||||
#include "hal/timer_ll.h"
|
||||
#include "esp_private/systimer.h"
|
||||
|
||||
#include "esp_system.h"
|
||||
#ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
|
||||
|
|
@ -173,7 +175,9 @@ static uint32_t calculateApb(rtc_cpu_freq_config_t *conf) {
|
|||
#endif
|
||||
}
|
||||
|
||||
#if defined(CONFIG_IDF_TARGET_ESP32) && !defined(LACT_MODULE) && !defined(LACT_TICKS_PER_US)
|
||||
void esp_timer_impl_update_apb_freq(uint32_t apb_ticks_per_us); //private in IDF
|
||||
#endif
|
||||
|
||||
bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
|
||||
rtc_cpu_freq_config_t conf, cconf;
|
||||
|
|
@ -246,7 +250,13 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
|
|||
//Update APB Freq REG
|
||||
rtc_clk_apb_freq_update(apb);
|
||||
//Update esp_timer divisor
|
||||
#if CONFIG_IDF_TARGET_ESP32
|
||||
#if defined(LACT_MODULE) && defined(LACT_TICKS_PER_US)
|
||||
timer_ll_set_lact_clock_prescale(TIMER_LL_GET_HW(LACT_MODULE), apb / MHZ / LACT_TICKS_PER_US);
|
||||
#else
|
||||
esp_timer_impl_update_apb_freq(apb / MHZ);
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
//Update FreeRTOS Tick Divisor
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
{
|
||||
"packager": "esp32",
|
||||
"name": "esp32-arduino-libs",
|
||||
"version": "idf-release_v5.4-fe753553-v1"
|
||||
"version": "idf-release_v5.4-aed8bdc8-v1"
|
||||
},
|
||||
{
|
||||
"packager": "esp32",
|
||||
|
|
@ -104,63 +104,63 @@
|
|||
"tools": [
|
||||
{
|
||||
"name": "esp32-arduino-libs",
|
||||
"version": "idf-release_v5.4-fe753553-v1",
|
||||
"version": "idf-release_v5.4-aed8bdc8-v1",
|
||||
"systems": [
|
||||
{
|
||||
"host": "i686-mingw32",
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
|
||||
"size": "353685379"
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
|
||||
"size": "353758763"
|
||||
},
|
||||
{
|
||||
"host": "x86_64-mingw32",
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
|
||||
"size": "353685379"
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
|
||||
"size": "353758763"
|
||||
},
|
||||
{
|
||||
"host": "arm64-apple-darwin",
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
|
||||
"size": "353685379"
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
|
||||
"size": "353758763"
|
||||
},
|
||||
{
|
||||
"host": "x86_64-apple-darwin",
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
|
||||
"size": "353685379"
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
|
||||
"size": "353758763"
|
||||
},
|
||||
{
|
||||
"host": "x86_64-pc-linux-gnu",
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
|
||||
"size": "353685379"
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
|
||||
"size": "353758763"
|
||||
},
|
||||
{
|
||||
"host": "i686-pc-linux-gnu",
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
|
||||
"size": "353685379"
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
|
||||
"size": "353758763"
|
||||
},
|
||||
{
|
||||
"host": "aarch64-linux-gnu",
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
|
||||
"size": "353685379"
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
|
||||
"size": "353758763"
|
||||
},
|
||||
{
|
||||
"host": "arm-linux-gnueabihf",
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
|
||||
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
|
||||
"size": "353685379"
|
||||
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
|
||||
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
|
||||
"size": "353758763"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue