alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-16 23:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

partition_table: Move from 0x4000 to 0x8000

Browse Source 
Also fix a bug with correctly padding bootloader image when length is
already a multiple of 16.
This commit is contained in:
Angus Gratton
2016-11-07 14:35:23 +11:00
parent 64f3893cb9
commit 7402a1b973
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,6 +62,7 @@ esp_err_t esp_image_load_segment_header(uint8_t index, uint32_t src_addr, const
}
for(int i = 0; i <= index && err == ESP_OK; i++) {
ESP_LOGV(TAG, "loading segment header %d at offset 0x%x", i, next_addr);
err = bootloader_flash_read(next_addr, segment_header, sizeof(esp_image_segment_header_t));
if (err == ESP_OK) {
if ((segment_header->data_len & 3) != 0
@@ -69,6 +70,7 @@ esp_err_t esp_image_load_segment_header(uint8_t index, uint32_t src_addr, const
ESP_LOGE(TAG, "invalid segment length 0x%x", segment_header->data_len);
err = ESP_ERR_IMAGE_INVALID;
}
ESP_LOGV(TAG, "segment data length 0x%x", segment_header->data_len);
next_addr += sizeof(esp_image_segment_header_t);
*segment_data_offset = next_addr;
next_addr += segment_header->data_len;
@@ -140,7 +142,11 @@ esp_err_t esp_image_basic_verify(uint32_t src_addr, uint32_t *p_length)
}
/* image padded to next full 16 byte block, with checksum byte at very end */
length += 15 - (length % 16);
ESP_LOGV(TAG, "unpadded image length 0x%x", length);
length += 16; /* always pad by at least 1 byte */
length = length - (length % 16);
ESP_LOGV(TAG, "padded image length 0x%x", length);
ESP_LOGD(TAG, "reading checksum block at 0x%x", src_addr + length - 16);
bootloader_flash_read(src_addr + length - 16, buf, 16);
if (checksum != buf[15]) {
ESP_LOGE(TAG, "checksum failed. Calculated 0x%x read 0x%x",