feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(flash): mutex between flash rom impl and flash opi

Browse Source
This commit is contained in:
armando
2025-03-14 10:39:10 +08:00
parent cbcee1625f
commit 9b845f9f8b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esptool_py/Kconfig.projbuild
View File

@@ -11,12 +11,12 @@ menu "Serial flasher config"
like compressed downloads and more. Usually you should not need to disable that feature like compressed downloads and more. Usually you should not need to disable that feature
config ESPTOOLPY_OCT_FLASH config ESPTOOLPY_OCT_FLASH
depends on IDF_TARGET_ESP32S3 depends on SOC_SPI_MEM_SUPPORT_FLASH_OPI_MODE
bool "Enable Octal Flash" bool "Enable Octal Flash"
default n default n
config ESPTOOLPY_FLASH_MODE_AUTO_DETECT config ESPTOOLPY_FLASH_MODE_AUTO_DETECT
depends on IDF_TARGET_ESP32S3 depends on SOC_SPI_MEM_SUPPORT_FLASH_OPI_MODE
bool "Choose flash mode automatically (please read help)" bool "Choose flash mode automatically (please read help)"
default y default y
help help

3
components/spi_flash/Kconfig
View File

@@ -240,7 +240,8 @@ menu "SPI Flash driver"
config SPI_FLASH_ROM_IMPL config SPI_FLASH_ROM_IMPL
bool "Use esp_flash implementation in ROM" bool "Use esp_flash implementation in ROM"
depends on ESP_ROM_HAS_SPI_FLASH depends on ESP_ROM_HAS_SPI_FLASH && !ESPTOOLPY_OCT_FLASH
# ROM never supports octal flash before. Future if ROM supports it we can use a ESP_ROM_x macro
default n default n
help help
Enable this flag to use new SPI flash driver functions from ROM instead of ESP-IDF. Enable this flag to use new SPI flash driver functions from ROM instead of ESP-IDF.