Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_example_power_save_build_fail_issue_v6.1' into 'release/v6.1'

Browse Source 
fix(esp_timer): preserve timer_process_alarm symbol for ldgen(Backport v6.1)

See merge request espressif/esp-idf!52738
This commit is contained in:
Jiang Jiang Jian
2026-09-15 11:57:01 +08:00
parent 2175e263ee 043180fcfd
commit c92c097e3b
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_timer/CMakeLists.txt
View File

@@ -14,7 +14,6 @@ else()
elseif(CONFIG_ESP_TIMER_IMPL_SYSTIMER)
list(APPEND srcs "src/esp_timer_impl_systimer.c")
endif()
if(CONFIG_SOC_SYSTIMER_SUPPORT_ETM)
list(APPEND srcs "src/esp_timer_etm.c")
endif()
@@ -22,7 +21,8 @@ else()
idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS include
PRIV_REQUIRES esp_hal_timg esp_hal_systimer
PRIV_INCLUDE_DIRS private_include)
PRIV_INCLUDE_DIRS private_include
LDFRAGMENTS linker.lf)
# Forces the linker to include esp_timer_init.c
target_link_libraries(${COMPONENT_LIB} INTERFACE "-u esp_timer_init_include_func")

6
components/esp_timer/linker.lf Normal file
View File

@@ -0,0 +1,6 @@
[mapping:esp_timer_wifi_pm]
archive: libesp_timer.a
entries:
if ESP_WIFI_SLP_IRAM_OPT = y && IDF_TARGET_ESP32 = y:
esp_timer:timer_task (noflash)
esp_timer:timer_process_alarm (noflash)

3
components/esp_timer/src/esp_timer.c
View File

@@ -484,7 +484,8 @@ static ESP_TIMER_IRAM_ATTR void timer_list_unlock(esp_timer_dispatch_t timer_typ
#ifdef CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD
ESP_TIMER_IRAM_ATTR
#endif
static void timer_process_alarm(esp_timer_dispatch_t dispatch_method)
// Keep this as a standalone symbol because ldgen maps it by name.
static void __attribute__((noinline, noclone)) timer_process_alarm(esp_timer_dispatch_t dispatch_method)
{
timer_list_lock(dispatch_method);
esp_timer_handle_t it;

7
components/esp_wifi/linker.lf
View File

@@ -163,10 +163,3 @@ entries:
if PM_ENABLE = y:
wifi_init:wifi_pm_sleep_lock_acquire (noflash)
wifi_init:wifi_pm_sleep_lock_release (noflash)
[mapping:esp_timer_wifi_pm]
archive: libesp_timer.a
entries:
if ESP_WIFI_SLP_IRAM_OPT = y && IDF_TARGET_ESP32 = y:
esp_timer:timer_task (noflash)
esp_timer:timer_process_alarm (noflash)