Merge branch 'bugfix/image_load_refactoring' into 'master'

bootloader: Fix a wrong offset in image_load after refactoring

See merge request espressif/esp-idf!13736
This commit is contained in:
Angus Gratton 2021-05-28 05:02:26 +00:00
commit d96e55f5d4

View File

@ -144,7 +144,7 @@ static esp_err_t image_load(esp_image_load_mode_t mode, const esp_partition_pos_
// For secure boot V1 on ESP32, we don't calculate SHA or verify signature on bootloaders.
// (For non-secure boot, we don't verify any SHA-256 hash appended to the bootloader because
// esptool.py may have rewritten the header - rely on esptool.py having verified the bootloader at flashing time, instead.)
bool verify_sha = (data->start_addr != ESP_BOOTLOADER_OFFSET) && do_verify;
bool verify_sha = (part->offset != ESP_BOOTLOADER_OFFSET) && do_verify;
#endif
if (data == NULL || part == NULL) {