Merge branch 'fix/mmap_cache_flash_wr_v6.1' into 'release/v6.1'

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

See merge request espressif/esp-idf!50117

components/bootloader_support/src/bootloader_common.c

@@ -86,6 +86,7 @@ bool bootloader_common_label_search(const char *list, char *label)
     return false;
 }
 
+//This function erases while mmap is not unmapped yet. Can't be called in the app while XIP on PSRAM.
 bool bootloader_common_erase_part_type_data(const char *list_erase, bool ota_data_erase)
 {
     const esp_partition_info_t *partitions;

components/bootloader_support/src/bootloader_utility.c

@@ -36,9 +36,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"
@@ -157,6 +154,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;
     }