Merge branch 'bugfix/size_calculation_in_ota_v4.1' into 'release/v4.1'

Fix size calculation to erase partition range for OTA image (v4.1)

See merge request espressif/esp-idf!8266
pull/5676/head
Mahavir Jain 2020-04-06 18:03:41 +08:00
commit ec5c123ef7
1 zmienionych plików z 2 dodań i 1 usunięć

Wyświetl plik

@ -157,7 +157,8 @@ esp_err_t esp_ota_begin(const esp_partition_t *partition, size_t image_size, esp
if ((image_size == 0) || (image_size == OTA_SIZE_UNKNOWN)) {
ret = esp_partition_erase_range(partition, 0, partition->size);
} else {
ret = esp_partition_erase_range(partition, 0, (image_size / SPI_FLASH_SEC_SIZE + 1) * SPI_FLASH_SEC_SIZE);
const int aligned_erase_size = (image_size + SPI_FLASH_SEC_SIZE - 1) & ~(SPI_FLASH_SEC_SIZE - 1);
ret = esp_partition_erase_range(partition, 0, aligned_erase_size);
}
if (ret != ESP_OK) {