alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 00:36:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/app_trace_tmo_init' into 'master'

Browse Source 
startup: init timer before calling esp_apptrace_tmo_init

See merge request espressif/esp-idf!16084
This commit is contained in:
Alexey Gerenkov 2021-11-25 19:35:46 +00:00
commit 47921a1588
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/esp_system/startup.c
View File

@ -237,6 +237,12 @@ static void do_core_init(void)
app CPU, and when that is not up yet, the memory will be inaccessible and heap_caps_init may
fail initializing it properly. */
heap_caps_init();
// When apptrace module is enabled, there will be SEGGER_SYSVIEW calls in the newlib init.
// SEGGER_SYSVIEW relies on apptrace module
// apptrace module uses esp_timer_get_time to determine timeout conditions.
// esp_timer early initialization is required for esp_timer_get_time to work.
esp_timer_early_init();
esp_newlib_init();
if (g_spiram_ok) {
@ -263,10 +269,6 @@ static void do_core_init(void)
esp_brownout_init();
#endif
// esp_timer early initialization is required for esp_timer_get_time to work.
// This needs to happen before VFS initialization, since some USB_SERIAL_JTAG VFS driver uses
// esp_timer_get_time to determine timeout conditions.
esp_timer_early_init();
esp_newlib_time_init();
#if CONFIG_VFS_SUPPORT_IO