Merge branch 'fix/s3_xip_opt_os_startup' into 'master'

fix(mspi): fixed possible boot failure in some builds when psram is enabled

Closes IDF-15634 and IDF-15637

See merge request espressif/esp-idf!48258
This commit is contained in:
Michael (XIAO Xufeng)
2026-05-13 18:55:35 +08:00
8 changed files with 105 additions and 12 deletions
@@ -552,6 +552,16 @@ void _ss_mspi_timing_enter_high_speed_mode(bool control_spi1)
mspi_timing_enter_high_speed_mode(control_spi1);
}
void _ss_mspi_timing_enter_low_speed_early(void)
{
mspi_timing_enter_low_speed_early();
}
void _ss_mspi_timing_enter_high_speed_early(void)
{
mspi_timing_enter_high_speed_early();
}
void _ss_mspi_timing_change_speed_mode_cache_safe(bool switch_down)
{
mspi_timing_change_speed_mode_cache_safe(switch_down);
@@ -36,6 +36,8 @@ PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x2b0 );
PROVIDE ( GDMA = 0x60080000 );
/* SPI Flash functions required from the ROM (refer esp32c5.rom.spiflash.ld) */
PROVIDE ( rom_spi_flash_disable_cache = 0x40000204 );
PROVIDE ( rom_spi_flash_restore_cache = 0x40000208 );
PROVIDE ( spi_flash_check_and_flush_cache = 0x40000230 );
PROVIDE ( spi_flash_chip_generic_config_host_io_mode = 0x400002d4 );
PROVIDE ( memspi_host_flush_cache = 0x40000318 );