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

Merge branch 'bugfix/anti_rollback_without_test_app' into 'master'

Browse Source 
bootloader: Anti-rollback mode doesn't run test_app

See merge request espressif/esp-idf!12225
This commit is contained in:
Angus Gratton
2021-02-09 14:16:51 +08:00
parent 1de3f00012 25ac1d4d28
commit 2c39010b3b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bootloader_support/src/bootloader_utility.c
+2 -2
View File
@@ -477,7 +477,7 @@ void bootloader_utility_load_boot_image(const bootloader_state_t *bs, int start_
esp_image_metadata_t image_data;
if (start_index == TEST_APP_INDEX) {
if (try_load_partition(&bs->test, &image_data)) {
if (check_anti_rollback(&bs->test) && try_load_partition(&bs->test, &image_data)) {
load_image(&image_data);
} else {
ESP_LOGE(TAG, "No bootable test partition in the partition table");
@@ -513,7 +513,7 @@ void bootloader_utility_load_boot_image(const bootloader_state_t *bs, int start_
log_invalid_app_partition(index);
}
if (try_load_partition(&bs->test, &image_data)) {
if (check_anti_rollback(&bs->test) && try_load_partition(&bs->test, &image_data)) {
ESP_LOGW(TAG, "Falling back to test app as only bootable partition");
load_image(&image_data);
}