bootloader: Factory reset not for deep sleep

Closes: https://github.com/espressif/esp-idf/issues/3800

Closes: IDFGH-1536
This commit is contained in:
KonstantinKondrashov 2019-07-31 22:31:58 +08:00
parent 1b8ed9abf0
commit f1e9b8299f

View File

@ -24,6 +24,7 @@
#include "bootloader_common.h" #include "bootloader_common.h"
#include "sdkconfig.h" #include "sdkconfig.h"
#include "esp_image_format.h" #include "esp_image_format.h"
#include "esp32/rom/rtc.h"
static const char* TAG = "boot"; static const char* TAG = "boot";
@ -74,7 +75,8 @@ static int selected_boot_partition(const bootloader_state_t *bs)
int boot_index = bootloader_utility_get_selected_boot_partition(bs); int boot_index = bootloader_utility_get_selected_boot_partition(bs);
if (boot_index == INVALID_INDEX) { if (boot_index == INVALID_INDEX) {
return boot_index; // Unrecoverable failure (not due to corrupt ota data or bad partition contents) return boot_index; // Unrecoverable failure (not due to corrupt ota data or bad partition contents)
} else { }
if (rtc_get_reset_reason(0) != DEEPSLEEP_RESET) {
// Factory firmware. // Factory firmware.
#ifdef CONFIG_BOOTLOADER_FACTORY_RESET #ifdef CONFIG_BOOTLOADER_FACTORY_RESET
if (bootloader_common_check_long_hold_gpio(CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET, CONFIG_BOOTLOADER_HOLD_TIME_GPIO) == 1) { if (bootloader_common_check_long_hold_gpio(CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET, CONFIG_BOOTLOADER_HOLD_TIME_GPIO) == 1) {