mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'fix/rom_mmap_page_num' into 'master'
fix(spi_flash): size the ROM mmap page table to the region the ROM searches See merge request espressif/esp-idf!52720
This commit is contained in:
@@ -99,6 +99,14 @@ const spi_flash_guard_funcs_t *IRAM_ATTR spi_flash_guard_get(void)
|
|||||||
|
|
||||||
#if CONFIG_SPI_FLASH_ROM_IMPL
|
#if CONFIG_SPI_FLASH_ROM_IMPL
|
||||||
#include "esp_heap_caps.h"
|
#include "esp_heap_caps.h"
|
||||||
|
#if ESP_ROM_HAS_SPI_FLASH_MMAP
|
||||||
|
#if ESP_ROM_NEEDS_SET_CACHE_MMU_SIZE
|
||||||
|
#include "soc/mmu.h"
|
||||||
|
#define ROM_MMAP_PAGE_NUM (CACHE_DROM_MMU_MAX_END / sizeof(uint32_t))
|
||||||
|
#else
|
||||||
|
#define ROM_MMAP_PAGE_NUM 128
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
void IRAM_ATTR *spi_flash_malloc_internal(size_t size)
|
void IRAM_ATTR *spi_flash_malloc_internal(size_t size)
|
||||||
{
|
{
|
||||||
@@ -115,7 +123,7 @@ void IRAM_ATTR spi_flash_rom_impl_init(void)
|
|||||||
spi_flash_mmap_os_func_set(spi_flash_malloc_internal, heap_caps_free);
|
spi_flash_mmap_os_func_set(spi_flash_malloc_internal, heap_caps_free);
|
||||||
|
|
||||||
extern esp_err_t spi_flash_mmap_page_num_init(uint32_t page_num);
|
extern esp_err_t spi_flash_mmap_page_num_init(uint32_t page_num);
|
||||||
spi_flash_mmap_page_num_init(128);
|
spi_flash_mmap_page_num_init(ROM_MMAP_PAGE_NUM);
|
||||||
#endif // ESP_ROM_HAS_SPI_FLASH_MMAP
|
#endif // ESP_ROM_HAS_SPI_FLASH_MMAP
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user