diff --git a/components/esp_timer/CMakeLists.txt b/components/esp_timer/CMakeLists.txt index c0d9a6932c3..bb23e9d4237 100644 --- a/components/esp_timer/CMakeLists.txt +++ b/components/esp_timer/CMakeLists.txt @@ -32,7 +32,8 @@ endif() idf_component_register(SRCS "${srcs}" INCLUDE_DIRS include PRIV_REQUIRES "${priv_requires}" - 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") diff --git a/components/esp_timer/linker.lf b/components/esp_timer/linker.lf new file mode 100644 index 00000000000..4aade496869 --- /dev/null +++ b/components/esp_timer/linker.lf @@ -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) diff --git a/components/esp_timer/src/esp_timer.c b/components/esp_timer/src/esp_timer.c index 61b24ec995f..58872af0f01 100644 --- a/components/esp_timer/src/esp_timer.c +++ b/components/esp_timer/src/esp_timer.c @@ -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; diff --git a/components/esp_wifi/linker.lf b/components/esp_wifi/linker.lf index 1f1f69f1ed3..830cdef2de8 100644 --- a/components/esp_wifi/linker.lf +++ b/components/esp_wifi/linker.lf @@ -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)