alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/app_trace_tmo_init_v4.4' into 'release/v4.4'

Browse Source 
startup: init timer before calling esp_apptrace_tmo_init (v4.4)

See merge request espressif/esp-idf!16136
This commit is contained in:
Roland Dobai 2021-11-26 11:53:09 +00:00
commit 3c02b30a54
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

@ -235,6 +235,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 app CPU, and when that is not up yet, the memory will be inaccessible and heap_caps_init may
fail initializing it properly. */ fail initializing it properly. */
heap_caps_init(); 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(); esp_newlib_init();
if (g_spiram_ok) { if (g_spiram_ok) {
@ -260,10 +266,6 @@ static void do_core_init(void)
esp_brownout_init(); esp_brownout_init();
#endif #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(); esp_newlib_time_init();
#if CONFIG_VFS_SUPPORT_IO #if CONFIG_VFS_SUPPORT_IO