Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/mmap_cache_flash_wr_v5.4' into 'release/v5.4'

Browse Source 
fix(mmap): Fixed rodata phys2cache mapping under XIP mode (v5.4)

See merge request espressif/esp-idf!50138
This commit is contained in:
Jiang Jiang Jian
2026-09-07 11:29:17 +08:00
parent 87bdb4fca9 d2765dfcc3
commit 9b4eb22857
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bootloader_support/src/bootloader_utility.c
+1
View File
@@ -138,6 +138,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;
}
components/spi_flash/flash_mmap.c
+1 -1
View File
@@ -405,7 +405,7 @@ const void * spi_flash_phys2cache(size_t phys_offs, spi_flash_mmap_memory_t memo
#endif
#if CONFIG_SPIRAM_RODATA
if (phys_page >= rodata_flash_start_page_get() && phys_page <= rodata_flash_start_page_get()) {
if (phys_page >= rodata_flash_start_page_get() && phys_page <= rodata_flash_end_page_get()) {
target = MMU_TARGET_PSRAM0;
phys_offs -= rodata_flash2spiram_offset() * CONFIG_MMU_PAGE_SIZE;
}