Merge branch 'fix/mutex_between_oct_flash_and_flash_rom_impl' into 'master'

flash: mutex between oct flash and flash rom impl

See merge request espressif/esp-idf!37760
This commit is contained in:
Armando (Dou Yiwen)
2025-03-21 14:51:08 +08:00
12 changed files with 29 additions and 28 deletions

View File

@@ -981,7 +981,7 @@ esp_err_t IRAM_ATTR bootloader_flash_reset_chip(void)
bool IRAM_ATTR bootloader_flash_is_octal_mode_enabled(void)
{
#if SOC_SPI_MEM_SUPPORT_OPI_MODE
#if SOC_SPI_MEM_SUPPORT_FLASH_OPI_MODE
return efuse_ll_get_flash_type();
#else
return false;