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

esp32: Fix wdt settings in esp_restart_noos

Browse Source 
Fixed compatibility the new apps with the old bootloaders.

Closes: https://github.com/espressif/esp-idf/issues/2927
This commit is contained in:
Konstantin Kondrashov 2019-01-10 20:17:04 +08:00
parent 65d01336d3
commit 82c5e648ad
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp32/system_api.c
View File

@ -279,8 +279,7 @@ void IRAM_ATTR esp_restart_noos()
rtc_wdt_set_length_of_reset_signal(RTC_WDT_SYS_RESET_SIG, RTC_WDT_LENGTH_200ns); rtc_wdt_set_length_of_reset_signal(RTC_WDT_SYS_RESET_SIG, RTC_WDT_LENGTH_200ns);
rtc_wdt_set_length_of_reset_signal(RTC_WDT_CPU_RESET_SIG, RTC_WDT_LENGTH_200ns); rtc_wdt_set_length_of_reset_signal(RTC_WDT_CPU_RESET_SIG, RTC_WDT_LENGTH_200ns);
rtc_wdt_set_time(RTC_WDT_STAGE0, 1000); rtc_wdt_set_time(RTC_WDT_STAGE0, 1000);
rtc_wdt_enable(); rtc_wdt_flashboot_mode_enable();
rtc_wdt_protect_on();
// Reset and stall the other CPU. // Reset and stall the other CPU.
// CPU must be reset before stalling, in case it was running a s32c1i // CPU must be reset before stalling, in case it was running a s32c1i

5
components/soc/esp32/rtc_wdt.c
View File

@ -38,6 +38,11 @@ void rtc_wdt_enable()
SET_PERI_REG_MASK(RTC_CNTL_WDTCONFIG0_REG, RTC_CNTL_WDT_EN | RTC_CNTL_WDT_PAUSE_IN_SLP); SET_PERI_REG_MASK(RTC_CNTL_WDTCONFIG0_REG, RTC_CNTL_WDT_EN | RTC_CNTL_WDT_PAUSE_IN_SLP);
} }
void rtc_wdt_flashboot_mode_enable()
{
REG_SET_BIT(RTC_CNTL_WDTCONFIG0_REG, RTC_CNTL_WDT_FLASHBOOT_MOD_EN);
}
void rtc_wdt_disable() void rtc_wdt_disable()
{ {
bool protect = rtc_wdt_get_protect_status(); bool protect = rtc_wdt_get_protect_status();

9
components/soc/include/soc/rtc_wdt.h
View File

@ -118,6 +118,15 @@ void rtc_wdt_protect_off();
*/ */
void rtc_wdt_enable(); void rtc_wdt_enable();
/**
* @brief Enable the flash boot protection procedure for WDT.
*
* Do not recommend to use it in the app.
* This function was added to be compatibility with the old bootloaders.
* This mode is disabled in bootloader or using rtc_wdt_disable() function.
*/
void rtc_wdt_flashboot_mode_enable();
/** /**
* @brief Disable rtc_wdt. * @brief Disable rtc_wdt.
*/ */