Merge branch 'feat/move_flash_120_out_from_experimental' into 'master'

flash: p4 flash 120MHz is no longer experimental feature See merge request espressif/esp-idf!51670
2026-09-22 13:01:16 +03:00 · 2026-08-12 08:58:38 +00:00
parent 6e49bfec02 346a36ada1
commit 2dd71fddaa
6 changed files with 0 additions and 6 deletions
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32p4_120sdr_200ddr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32p4_120sdr_200ddr
@@ -1,6 +1,5 @@
 CONFIG_IDF_TARGET="esp32p4"

-CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_SPEED_200M=y
 CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
--- a/components/spi_flash/esp32p4/Kconfig.flash_freq
+++ b/components/spi_flash/esp32p4/Kconfig.flash_freq
@@ -4,7 +4,6 @@ choice ESPTOOLPY_FLASHFREQ
    default ESPTOOLPY_FLASHFREQ_80M
    config ESPTOOLPY_FLASHFREQ_120M
        bool "120 MHz"
-        depends on IDF_EXPERIMENTAL_FEATURES
        depends on !ESP32P4_REV_MIN_0
    config ESPTOOLPY_FLASHFREQ_80M
        bool "80 MHz"
--- a/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.p4_32m_120m_dio
+++ b/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.p4_32m_120m_dio
@@ -1,7 +1,6 @@
 CONFIG_IDF_TARGET="esp32p4"

 CONFIG_ESP_TASK_WDT_INIT=n
-CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y
 CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
 CONFIG_BOOTLOADER_FLASH_DC_AWARE=y
--- a/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.p4_32m_120m_dio_map
+++ b/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.p4_32m_120m_dio_map
@@ -1,7 +1,6 @@
 CONFIG_IDF_TARGET="esp32p4"

 CONFIG_ESP_TASK_WDT_INIT=n
-CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y
 CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
 CONFIG_BOOTLOADER_FLASH_DC_AWARE=y
--- a/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.p4_32m_120m_qio
+++ b/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.p4_32m_120m_qio
@@ -1,7 +1,6 @@
 CONFIG_IDF_TARGET="esp32p4"

 CONFIG_ESP_TASK_WDT_INIT=n
-CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y
 CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
 CONFIG_BOOTLOADER_FLASH_DC_AWARE=y
--- a/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.p4_32m_120m_qio_map
+++ b/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.p4_32m_120m_qio_map
@@ -1,7 +1,6 @@
 CONFIG_IDF_TARGET="esp32p4"

 CONFIG_ESP_TASK_WDT_INIT=n
-CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y
 CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
 CONFIG_BOOTLOADER_FLASH_DC_AWARE=y