Skip to content

Commit

Permalink
Merge branch 'bugfix/image_load_refactoring' into 'master'
Browse files Browse the repository at this point in the history
bootloader: Fix a wrong offset in image_load after refactoring

See merge request espressif/esp-idf!13736
  • Loading branch information
projectgus committed May 28, 2021
2 parents d8c77d0 + 071e00a commit d96e55f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/bootloader_support/src/esp_image_format.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit d96e55f

Please sign in to comment.