espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/esp32_sw_breaks' into 'master'

Browse Source 
ESP32 SW Breakpoints Support

See merge request idf/esp-idf!2316
This commit is contained in:
Ivan Grokhotkov
2018-04-26 18:05:38 +08:00
parent add969f69d 439140d269
commit 0236592fe5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/bootloader_support/src/esp_image_format.c
View File

@@ -157,11 +157,12 @@ goto err;
data->image_len = end_addr - data->start_addr; data->image_len = end_addr - data->start_addr;
ESP_LOGV(TAG, "image start 0x%08x end of last section 0x%08x", data->start_addr, end_addr); ESP_LOGV(TAG, "image start 0x%08x end of last section 0x%08x", data->start_addr, end_addr);
err = verify_checksum(sha_handle, checksum_word, data); if (!esp_cpu_in_ocd_debug_mode()) {
if (err != ESP_OK) { err = verify_checksum(sha_handle, checksum_word, data);
goto err; if (err != ESP_OK) {
goto err;
}
} }
if (data->image_len > part->size) { if (data->image_len > part->size) {
FAIL_LOAD("Image length %d doesn't fit in partition length %d", data->image_len, part->size); FAIL_LOAD("Image length %d doesn't fit in partition length %d", data->image_len, part->size);
} }
@@ -178,7 +179,7 @@ goto err;
err = verify_secure_boot_signature(sha_handle, data); err = verify_secure_boot_signature(sha_handle, data);
#else #else
// No secure boot, but SHA-256 can be appended for basic corruption detection // No secure boot, but SHA-256 can be appended for basic corruption detection
if (sha_handle != NULL) { if (sha_handle != NULL && !esp_cpu_in_ocd_debug_mode()) {
err = verify_simple_hash(sha_handle, data); err = verify_simple_hash(sha_handle, data);
} }
#endif // CONFIG_SECURE_BOOT_ENABLED #endif // CONFIG_SECURE_BOOT_ENABLED