Merge branch 'fix/mmap_cache_flash_wr' into 'master'

fix(mmap): fixed mmap read data wrong when flash being erased/written and cache not disabled

Closes IDFGH-14084

See merge request espressif/esp-idf!29804
This commit is contained in:
Michael (XIAO Xufeng)
2026-06-29 11:44:10 +08:00
73 changed files with 1680 additions and 488 deletions
@@ -37,9 +37,6 @@
#include "esp_app_desc.h"
#include "esp_secure_boot.h"
#include "esp_flash_encrypt.h"
#ifndef BOOTLOADER_BUILD
#include "spi_flash_mmap.h"
#endif
#include "esp_flash_partitions.h"
#include "bootloader_flash_priv.h"
#include "bootloader_random.h"
@@ -158,6 +155,7 @@ bool bootloader_utility_load_partition_table(bootloader_state_t *bs)
err = esp_partition_table_verify(partitions, true, &num_partitions);
if (err != ESP_OK) {
ESP_LOGE(TAG, "Failed to verify partition table");
bootloader_munmap(partitions);
return false;
}