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 'feature/cpu_restart_sequence' into 'master'

Browse Source 
Restart sequence requires set up for app cpu.

These changes required to make correct restart of CPU form JTAG.

See merge request !703
This commit is contained in:
Ivan Grokhotkov 2017-04-27 09:30:42 +08:00
commit fe695a9af8
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bootloader/src/main/bootloader_start.c
View File

@ -253,6 +253,8 @@ void bootloader_main()
memset(&bs, 0, sizeof(bs)); memset(&bs, 0, sizeof(bs));
ESP_LOGI(TAG, "compile time " __TIME__ ); ESP_LOGI(TAG, "compile time " __TIME__ );
ets_set_appcpu_boot_addr(0);
/* disable watch dog here */ /* disable watch dog here */
REG_CLR_BIT( RTC_CNTL_WDTCONFIG0_REG, RTC_CNTL_WDT_FLASHBOOT_MOD_EN ); REG_CLR_BIT( RTC_CNTL_WDTCONFIG0_REG, RTC_CNTL_WDT_FLASHBOOT_MOD_EN );
REG_CLR_BIT( TIMG_WDTCONFIG0_REG(0), TIMG_WDT_FLASHBOOT_MOD_EN ); REG_CLR_BIT( TIMG_WDTCONFIG0_REG(0), TIMG_WDT_FLASHBOOT_MOD_EN );

1
components/esp32/cpu_start.c
View File

@ -175,6 +175,7 @@ void IRAM_ATTR call_start_cpu1()
"wsr %0, vecbase\n" \ "wsr %0, vecbase\n" \
::"r"(&_init_start)); ::"r"(&_init_start));
ets_set_appcpu_boot_addr(0);
cpu_configure_region_protection(); cpu_configure_region_protection();
#if CONFIG_CONSOLE_UART_NONE #if CONFIG_CONSOLE_UART_NONE