pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/esp32s2beta' into feature/esp32s2beta_merge

Browse Source
This commit is contained in:
Angus Gratton
2019-09-19 21:08:20 +10:00
committed by Angus Gratton
parent 6b7da96d5b bcaaaa1632
commit 83680bd96b
11 changed files with 259 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bootloader_support/src/bootloader_init.c
+2 -2
View File
@@ -189,7 +189,7 @@ static esp_err_t bootloader_main(void)
ets_set_appcpu_boot_addr(0);
#endif
#if CONFIG_BOOTLOADER_WDT_ENABLE && CONFIG_IDF_TARGET_ESP32
#ifdef CONFIG_BOOTLOADER_WDT_ENABLE
ESP_LOGD(TAG, "Enabling RTCWDT(%d ms)", CONFIG_BOOTLOADER_WDT_TIME_MS);
rtc_wdt_protect_off();
rtc_wdt_disable();
@@ -199,7 +199,7 @@ static esp_err_t bootloader_main(void)
rtc_wdt_set_time(RTC_WDT_STAGE0, CONFIG_BOOTLOADER_WDT_TIME_MS);
rtc_wdt_enable();
rtc_wdt_protect_on();
#elif CONFIG_IDF_TARGET_ESP32
#else
/* disable watch dog here */
rtc_wdt_disable();
#endif