Merge branch 'fix/flash_mmap_c5' into 'master'

fix(flash_mmap): Fix flash memory map failed after psram is enabled

Closes IDF-10451

See merge request espressif/esp-idf!32069
This commit is contained in:
C.S.M 2024-07-12 15:01:28 +08:00
commit c61c3ac32d

View File

@ -305,7 +305,8 @@ static inline bool mmu_ll_check_entry_valid(uint32_t mmu_id, uint32_t entry_id)
static inline mmu_target_t mmu_ll_get_entry_target(uint32_t mmu_id, uint32_t entry_id) static inline mmu_target_t mmu_ll_get_entry_target(uint32_t mmu_id, uint32_t entry_id)
{ {
(void)mmu_id; (void)mmu_id;
return MMU_TARGET_FLASH0; mmu_target_t target = ((REG_READ(SPI_MEM_MMU_ITEM_CONTENT_REG(0)) & SOC_MMU_ACCESS_SPIRAM) == 0) ? MMU_TARGET_FLASH0 : MMU_TARGET_PSRAM0;
return target;
} }
/** /**