From c81cf3bdf6e0cc4269e4d383defcd5fcefde63c8 Mon Sep 17 00:00:00 2001 From: "C.S.M" Date: Tue, 23 Sep 2025 15:42:15 +0800 Subject: [PATCH] refactor(spi_flash): Remove spi_flash rom driver patch config option --- .../src/bootloader_flash_config_esp32.c | 7 ----- .../src/bootloader_flash_config_esp32c3.c | 7 ----- .../src/bootloader_flash_config_esp32s2.c | 7 ----- .../src/bootloader_flash_config_esp32s3.c | 7 ----- components/esp_rom/CMakeLists.txt | 8 ----- .../esp32/ld/esp32.rom.spiflash_legacy.ld | 29 ------------------- components/esp_rom/patches/esp_rom_spiflash.c | 4 --- components/spi_flash/Kconfig | 9 +----- .../esp_flash/sdkconfig.ci.rom_patch | 1 - docs/en/api-guides/performance/ram-usage.rst | 1 - .../release-6.x/6.0/peripherals.rst | 1 + .../api-guides/performance/ram-usage.rst | 1 - .../release-6.x/6.0/peripherals.rst | 1 + .../bluetooth/blufi/sdkconfig.defaults.mini | 1 - .../ble_cts/cts_cent/sdkconfig.defaults.mini | 1 - .../ble_cts/cts_prph/sdkconfig.defaults.mini | 1 - .../sdkconfig.defaults.mini | 1 - .../enc_adv_data_cent/sdkconfig.defaults.mini | 1 - .../enc_adv_data_prph/sdkconfig.defaults.mini | 1 - .../ble_htp/htp_cent/sdkconfig.defaults.mini | 1 - .../ble_htp/htp_prph/sdkconfig.defaults.mini | 1 - .../coc_blecent/sdkconfig.defaults.mini | 1 - .../coc_bleprph/sdkconfig.defaults.mini | 1 - .../ble_multi_adv/sdkconfig.defaults.mini | 1 - .../ble_periodic_adv/sdkconfig.defaults.mini | 1 - .../ble_periodic_sync/sdkconfig.defaults.mini | 1 - .../ble_phy/phy_cent/sdkconfig.defaults.mini | 1 - .../ble_phy/phy_prph/sdkconfig.defaults.mini | 1 - .../sdkconfig.defaults.mini | 1 - .../sdkconfig.defaults.mini | 1 - .../spp_server/sdkconfig.defaults.mini | 1 - .../nimble/blecent/sdkconfig.defaults.mini | 1 - .../nimble/blecsc/sdkconfig.defaults.mini | 1 - .../nimble/blehr/sdkconfig.defaults.mini | 1 - .../nimble/bleprph/sdkconfig.defaults.mini | 1 - .../nimble/power_save/sdkconfig.defaults.mini | 1 - tools/ldgen/samples/sdkconfig | 1 - 37 files changed, 3 insertions(+), 104 deletions(-) delete mode 100644 components/esp_rom/esp32/ld/esp32.rom.spiflash_legacy.ld delete mode 100644 components/spi_flash/test_apps/esp_flash/sdkconfig.ci.rom_patch diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32.c index e117e2a36a..ccfec0a8b0 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32.c @@ -382,13 +382,6 @@ static void IRAM_ATTR bootloader_init_flash_configure(void) esp_err_t bootloader_init_spi_flash(void) { bootloader_init_flash_configure(); -#ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH - const uint32_t spiconfig = esp_rom_efuse_get_flash_gpio_info(); - if (spiconfig != ESP_ROM_EFUSE_FLASH_DEFAULT_SPI && spiconfig != ESP_ROM_EFUSE_FLASH_DEFAULT_HSPI) { - ESP_EARLY_LOGE(TAG, "SPI flash pins are overridden. Enable CONFIG_SPI_FLASH_ROM_DRIVER_PATCH in menuconfig"); - return ESP_FAIL; - } -#endif if ((void*)bootloader_flash_unlock != (void*)bootloader_flash_unlock_default) { ESP_EARLY_LOGD(TAG, "Using overridden bootloader_flash_unlock"); diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c index c6cdfc9cb0..c99ee89dc6 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c @@ -256,13 +256,6 @@ static void bootloader_spi_flash_resume(void) esp_err_t bootloader_init_spi_flash(void) { bootloader_init_flash_configure(); -#ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH - const uint32_t spiconfig = esp_rom_efuse_get_flash_gpio_info(); - if (spiconfig != ESP_ROM_EFUSE_FLASH_DEFAULT_SPI && spiconfig != ESP_ROM_EFUSE_FLASH_DEFAULT_HSPI) { - ESP_EARLY_LOGE(TAG, "SPI flash pins are overridden. Enable CONFIG_SPI_FLASH_ROM_DRIVER_PATCH in menuconfig"); - return ESP_FAIL; - } -#endif bootloader_spi_flash_resume(); if ((void*)bootloader_flash_unlock != (void*)bootloader_flash_unlock_default) { diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s2.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s2.c index 3513f3f318..15b8c1350d 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s2.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s2.c @@ -254,13 +254,6 @@ static void IRAM_ATTR bootloader_init_flash_configure(void) esp_err_t bootloader_init_spi_flash(void) { bootloader_init_flash_configure(); -#ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH - const uint32_t spiconfig = esp_rom_efuse_get_flash_gpio_info(); - if (spiconfig != ESP_ROM_EFUSE_FLASH_DEFAULT_SPI && spiconfig != ESP_ROM_EFUSE_FLASH_DEFAULT_HSPI) { - ESP_EARLY_LOGE(TAG, "SPI flash pins are overridden. Enable CONFIG_SPI_FLASH_ROM_DRIVER_PATCH in menuconfig"); - return ESP_FAIL; - } -#endif if ((void*)bootloader_flash_unlock != (void*)bootloader_flash_unlock_default) { ESP_EARLY_LOGD(TAG, "Using overridden bootloader_flash_unlock"); diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c index c86c30f63d..f027fdc381 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c @@ -272,13 +272,6 @@ static void bootloader_spi_flash_resume(void) esp_err_t bootloader_init_spi_flash(void) { bootloader_init_flash_configure(); -#ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH - const uint32_t spiconfig = esp_rom_efuse_get_flash_gpio_info(); - if (spiconfig != ESP_ROM_EFUSE_FLASH_DEFAULT_SPI && spiconfig != ESP_ROM_EFUSE_FLASH_DEFAULT_HSPI) { - ESP_EARLY_LOGE(TAG, "SPI flash pins are overridden. Enable CONFIG_SPI_FLASH_ROM_DRIVER_PATCH in menuconfig"); - return ESP_FAIL; - } -#endif #if CONFIG_BOOTLOADER_FLASH_DC_AWARE // Reset flash, clear volatile bits DC[0:1]. Make it work under default mode to boot. diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt index 9d76611d67..c8540aa486 100644 --- a/components/esp_rom/CMakeLists.txt +++ b/components/esp_rom/CMakeLists.txt @@ -173,9 +173,6 @@ endif() if(BOOTLOADER_BUILD) if(target STREQUAL "esp32") - if(NOT CONFIG_SPI_FLASH_ROM_DRIVER_PATCH) - rom_linker_script("spiflash_legacy") - endif() if(CONFIG_ESP32_REV_MIN_FULL GREATER_EQUAL 300) rom_linker_script("eco3") endif() @@ -235,11 +232,6 @@ else() # Regular app build endif() endif() - if(NOT CONFIG_SPI_FLASH_ROM_DRIVER_PATCH) - # For ESP32, inclusion of ROM driver do not depend on CONFIG_SPI_FLASH_ROM_IMPL - rom_linker_script("spiflash_legacy") - endif() - if(CONFIG_ESP32_REV_MIN_FULL GREATER_EQUAL 300) rom_linker_script("eco3") endif() diff --git a/components/esp_rom/esp32/ld/esp32.rom.spiflash_legacy.ld b/components/esp_rom/esp32/ld/esp32.rom.spiflash_legacy.ld deleted file mode 100644 index b68b897a98..0000000000 --- a/components/esp_rom/esp32/ld/esp32.rom.spiflash_legacy.ld +++ /dev/null @@ -1,29 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -/* - Address table for SPI driver functions in ESP32 ROM. - These functions are only linked from ROM when SPI_FLASH_ROM_DRIVER_PATCH is not set in configuration. -*/ - -PROVIDE ( esp_rom_spiflash_write_encrypted = 0x40062e78 ); -PROVIDE ( esp_rom_spiflash_erase_area = 0x400631ac ); -PROVIDE ( esp_rom_spiflash_erase_block = 0x40062c4c ); -PROVIDE ( esp_rom_spiflash_erase_chip = 0x40062c14 ); -PROVIDE ( esp_rom_spiflash_erase_sector = 0x40062ccc ); -PROVIDE ( esp_rom_spiflash_attach = 0x40062a6c ); -PROVIDE ( esp_rom_spiflash_lock = 0x400628f0 ); -PROVIDE ( esp_rom_spiflash_read = 0x40062ed8 ); -PROVIDE ( esp_rom_spiflash_config_readmode = 0x40062b64 ); /* SPIMasterReadModeCnfig */ -PROVIDE ( esp_rom_spiflash_read_status = 0x4006226c ); -PROVIDE ( esp_rom_spiflash_read_statushigh = 0x40062448 ); -PROVIDE ( esp_rom_spiflash_write = 0x40062d50 ); -PROVIDE ( esp_rom_spiflash_enable_write = 0x40062320 ); -PROVIDE ( esp_rom_spiflash_write_status = 0x400622f0 ); - -/* always using patched versions of these functions -PROVIDE ( esp_rom_spiflash_wait_idle = 0x400622c0 ); -PROVIDE ( esp_rom_spiflash_unlock = 0x400????? ); -*/ diff --git a/components/esp_rom/patches/esp_rom_spiflash.c b/components/esp_rom/patches/esp_rom_spiflash.c index b811f061a9..f66bc8b5f7 100644 --- a/components/esp_rom/patches/esp_rom_spiflash.c +++ b/components/esp_rom/patches/esp_rom_spiflash.c @@ -111,8 +111,6 @@ esp_rom_spiflash_result_t esp_rom_spiflash_unlock(void) __attribute__((alias("es #endif // CONFIG_IDF_TARGET_ESP32 -#if CONFIG_SPI_FLASH_ROM_DRIVER_PATCH - #if CONFIG_IDF_TARGET_ESP32 static esp_rom_spiflash_result_t esp_rom_spiflash_enable_write(esp_rom_spiflash_chip_t *spi); @@ -801,5 +799,3 @@ void esp_rom_opiflash_cache_mode_config(esp_rom_spiflash_read_mode_t mode, const } #endif // IDF_TARGET - -#endif // CONFIG_SPI_FLASH_ROM_DRIVER_PATCH diff --git a/components/spi_flash/Kconfig b/components/spi_flash/Kconfig index aaab20eaa4..f96bfab045 100644 --- a/components/spi_flash/Kconfig +++ b/components/spi_flash/Kconfig @@ -241,14 +241,7 @@ menu "SPI Flash driver" These APIs may be used to collect performance data for spi_flash APIs and to help understand behaviour of libraries which use SPI flash. - config SPI_FLASH_ROM_DRIVER_PATCH - bool "Enable SPI flash ROM driver patched functions" - default y - help - Enable this flag to use patched versions of SPI flash ROM driver functions. - This option should be enabled, if any one of the following is true: (1) need to write - to flash on ESP32-D2WD; (2) main SPI flash is connected to non-default pins; (3) main - SPI flash chip is manufactured by ISSI. + config SPI_FLASH_ROM_IMPL bool "Use esp_flash implementation in ROM" diff --git a/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.rom_patch b/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.rom_patch deleted file mode 100644 index fd63e157f9..0000000000 --- a/components/spi_flash/test_apps/esp_flash/sdkconfig.ci.rom_patch +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n diff --git a/docs/en/api-guides/performance/ram-usage.rst b/docs/en/api-guides/performance/ram-usage.rst index 0d946f85e4..3020f25072 100644 --- a/docs/en/api-guides/performance/ram-usage.rst +++ b/docs/en/api-guides/performance/ram-usage.rst @@ -184,7 +184,6 @@ The following options will reduce IRAM usage of some ESP-IDF features: - Enable :ref:`CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH`. This option is not safe to use if the ISR ringbuf functions are used from an IRAM interrupt context, e.g., if :ref:`CONFIG_UART_ISR_IN_IRAM` is enabled. For the ESP-IDF drivers where this is the case, you can get an error at run-time when installing the driver in question. :SOC_WIFI_SUPPORTED: - Disabling Wi-Fi options :ref:`CONFIG_ESP_WIFI_IRAM_OPT` and/or :ref:`CONFIG_ESP_WIFI_RX_IRAM_OPT` options frees available IRAM at the cost of Wi-Fi performance. :CONFIG_ESP_ROM_HAS_SPI_FLASH: - Enabling :ref:`CONFIG_SPI_FLASH_ROM_IMPL` frees some IRAM but means that esp_flash bugfixes and new flash chip support are not available, see :doc:`/api-reference/peripherals/spi_flash/spi_flash_idf_vs_rom` for details. - :esp32: - Disabling :ref:`CONFIG_SPI_FLASH_ROM_DRIVER_PATCH` frees some IRAM but is only available in some flash configurations, see the configuration item help text. :esp32: - If the application uses PSRAM and is based on ESP32 rev. 3 (ECO3), setting :ref:`CONFIG_ESP32_REV_MIN` to ``3`` disables PSRAM bug workarounds, saving 10 KB or more of IRAM. - Disabling :ref:`CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR` prevents posting ``esp_event`` events from :ref:`iram-safe-interrupt-handlers` but saves some IRAM. :SOC_GPSPI_SUPPORTED: - Disabling :ref:`CONFIG_SPI_MASTER_ISR_IN_IRAM` prevents spi_master interrupts from being serviced while writing to flash, and may otherwise reduce spi_master performance, but saves some IRAM. diff --git a/docs/en/migration-guides/release-6.x/6.0/peripherals.rst b/docs/en/migration-guides/release-6.x/6.0/peripherals.rst index 2e519de8d4..5ed7293511 100644 --- a/docs/en/migration-guides/release-6.x/6.0/peripherals.rst +++ b/docs/en/migration-guides/release-6.x/6.0/peripherals.rst @@ -288,6 +288,7 @@ SPI Flash Driver - Deprecated API ``spi_flash_dump_counters`` has been removed. Please use :cpp:func:`esp_flash_dump_counters` instead. - Deprecated API ``spi_flash_get_counters`` has been removed. Please use :cpp:func:`esp_flash_get_counters` instead. - Deprecated API ``spi_flash_reset_counters`` has been removed. Please use :cpp:func:`esp_flash_reset_counters` instead. +- Kconfig option ``CONFIG_SPI_FLASH_ROM_DRIVER_PATCH`` has been removed. Considering that this option is unlikely to be widely used by users and may cause serious issues if misused, it has been decided to remove it. .. note:: diff --git a/docs/zh_CN/api-guides/performance/ram-usage.rst b/docs/zh_CN/api-guides/performance/ram-usage.rst index b2c20d5492..d58bd9ebe8 100644 --- a/docs/zh_CN/api-guides/performance/ram-usage.rst +++ b/docs/zh_CN/api-guides/performance/ram-usage.rst @@ -184,7 +184,6 @@ IRAM 优化 - 启用 :ref:`CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH`。如果从 IRAM 中的中断上下文中使用 ISR ringbuf 函数，例如启用了 :ref:`CONFIG_UART_ISR_IN_IRAM`，则无法安全使用此选项。在此情况下，安装 ESP-IDF 相关驱动程序时，将在运行时报错。 :SOC_WIFI_SUPPORTED: - 禁用 Wi-Fi 选项 :ref:`CONFIG_ESP_WIFI_IRAM_OPT` 和/或 :ref:`CONFIG_ESP_WIFI_RX_IRAM_OPT` 会释放可用 IRAM，但会牺牲部分 Wi-Fi 性能。 :CONFIG_ESP_ROM_HAS_SPI_FLASH: - 启用 :ref:`CONFIG_SPI_FLASH_ROM_IMPL` 选项可以释放一些 IRAM，但此时 esp_flash 错误修复程序及新的 flash 芯片支持将失效，详情请参阅 :doc:`/api-reference/peripherals/spi_flash/spi_flash_idf_vs_rom`。 - :esp32: - 禁用 :ref:`CONFIG_SPI_FLASH_ROM_DRIVER_PATCH` 选项可以释放一些 IRAM，但仅适用于某些 flash 配置，详情请参阅配置项帮助文档。 :esp32: - 如果应用程序基于 ESP32 rev. 3 (ECO3)，且使用 PSRAM，设置 :ref:`CONFIG_ESP32_REV_MIN` 为 ``3``，可以禁用 PSRAM 的错误处理程序，节省 10 KB 乃至更多的 IRAM。 - 禁用 :ref:`CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR` 可以防止从 :ref:`iram-safe-interrupt-handlers` 中发布 ``esp_event`` 事件，节省 IRAM 空间。 :SOC_GPSPI_SUPPORTED: - 禁用 :ref:`CONFIG_SPI_MASTER_ISR_IN_IRAM` 可以防止在写入 flash 时发生 spi_master 中断，节省 IRAM 空间，但可能影响 spi_master 的性能。 diff --git a/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst b/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst index 64417d3268..51c52e41fa 100644 --- a/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst +++ b/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst @@ -288,6 +288,7 @@ SPI flash 驱动 - 已弃用的 API ``spi_flash_dump_counters`` 已被移除。请改用 :cpp:func:`esp_flash_dump_counters`。 - 已弃用的 API ``spi_flash_get_counters`` 已被移除。请改用 :cpp:func:`esp_flash_get_counters`。 - 已弃用的 API ``spi_flash_reset_counters`` 已被移除。请改用 :cpp:func:`esp_flash_reset_counters`。 +- Kconfig 选项 ``CONFIG_SPI_FLASH_ROM_DRIVER_PATCH`` 已被移除，考虑到这个选项不会被广泛被用户使用，且有因误用而导致出现严重的问题，遂决定移除。 .. note:: diff --git a/examples/bluetooth/blufi/sdkconfig.defaults.mini b/examples/bluetooth/blufi/sdkconfig.defaults.mini index 0ce8d6102d..ae88731ccd 100644 --- a/examples/bluetooth/blufi/sdkconfig.defaults.mini +++ b/examples/bluetooth/blufi/sdkconfig.defaults.mini @@ -101,7 +101,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_cts/cts_cent/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_cts/cts_cent/sdkconfig.defaults.mini index e5fa165ec0..27e15f17c7 100644 --- a/examples/bluetooth/nimble/ble_cts/cts_cent/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_cts/cts_cent/sdkconfig.defaults.mini @@ -76,7 +76,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_cts/cts_prph/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_cts/cts_prph/sdkconfig.defaults.mini index edc3f1f996..5562e260c3 100644 --- a/examples/bluetooth/nimble/ble_cts/cts_prph/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_cts/cts_prph/sdkconfig.defaults.mini @@ -88,7 +88,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_dynamic_service/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_dynamic_service/sdkconfig.defaults.mini index fedfd146e9..eb2a6dc58c 100644 --- a/examples/bluetooth/nimble/ble_dynamic_service/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_dynamic_service/sdkconfig.defaults.mini @@ -90,7 +90,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/sdkconfig.defaults.mini index 0ee8f9eec4..5a6b0fdda2 100644 --- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/sdkconfig.defaults.mini @@ -78,7 +78,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/sdkconfig.defaults.mini index 3ac42eff28..74e26885ac 100644 --- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/sdkconfig.defaults.mini @@ -91,7 +91,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_htp/htp_cent/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_htp/htp_cent/sdkconfig.defaults.mini index e5fa165ec0..27e15f17c7 100644 --- a/examples/bluetooth/nimble/ble_htp/htp_cent/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_htp/htp_cent/sdkconfig.defaults.mini @@ -76,7 +76,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_htp/htp_prph/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_htp/htp_prph/sdkconfig.defaults.mini index b353f05968..03972290d6 100644 --- a/examples/bluetooth/nimble/ble_htp/htp_prph/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_htp/htp_prph/sdkconfig.defaults.mini @@ -88,7 +88,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/sdkconfig.defaults.mini index 9907dd4f5f..1c4e2875e2 100644 --- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/sdkconfig.defaults.mini @@ -78,7 +78,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/sdkconfig.defaults.mini index cc1ec7bb64..2a449000dd 100644 --- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/sdkconfig.defaults.mini @@ -91,7 +91,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_multi_adv/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_multi_adv/sdkconfig.defaults.mini index aedfe116c7..6aae40458c 100644 --- a/examples/bluetooth/nimble/ble_multi_adv/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_multi_adv/sdkconfig.defaults.mini @@ -90,7 +90,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_periodic_adv/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_periodic_adv/sdkconfig.defaults.mini index 4c9ca092ce..016a4e8af9 100644 --- a/examples/bluetooth/nimble/ble_periodic_adv/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_periodic_adv/sdkconfig.defaults.mini @@ -91,7 +91,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_periodic_sync/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_periodic_sync/sdkconfig.defaults.mini index a718452e62..18fe683028 100644 --- a/examples/bluetooth/nimble/ble_periodic_sync/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_periodic_sync/sdkconfig.defaults.mini @@ -78,7 +78,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_phy/phy_cent/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_phy/phy_cent/sdkconfig.defaults.mini index 31a641823d..d32a3bff34 100644 --- a/examples/bluetooth/nimble/ble_phy/phy_cent/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_phy/phy_cent/sdkconfig.defaults.mini @@ -78,7 +78,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_phy/phy_prph/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_phy/phy_prph/sdkconfig.defaults.mini index e58fb3a2ac..31542644b6 100644 --- a/examples/bluetooth/nimble/ble_phy/phy_prph/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_phy/phy_prph/sdkconfig.defaults.mini @@ -91,7 +91,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/sdkconfig.defaults.mini index e5fa165ec0..27e15f17c7 100644 --- a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/sdkconfig.defaults.mini @@ -76,7 +76,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_prph/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_prph/sdkconfig.defaults.mini index 5efef9a761..dc04687d28 100644 --- a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_prph/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_prph/sdkconfig.defaults.mini @@ -88,7 +88,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/ble_spp/spp_server/sdkconfig.defaults.mini b/examples/bluetooth/nimble/ble_spp/spp_server/sdkconfig.defaults.mini index 749ed66c83..9770e33935 100644 --- a/examples/bluetooth/nimble/ble_spp/spp_server/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/ble_spp/spp_server/sdkconfig.defaults.mini @@ -89,7 +89,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/blecent/sdkconfig.defaults.mini b/examples/bluetooth/nimble/blecent/sdkconfig.defaults.mini index 0738b3cce0..b56505a6ff 100644 --- a/examples/bluetooth/nimble/blecent/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/blecent/sdkconfig.defaults.mini @@ -76,7 +76,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/blecsc/sdkconfig.defaults.mini b/examples/bluetooth/nimble/blecsc/sdkconfig.defaults.mini index b7ab3e6f96..d6d160fae1 100644 --- a/examples/bluetooth/nimble/blecsc/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/blecsc/sdkconfig.defaults.mini @@ -89,7 +89,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/blehr/sdkconfig.defaults.mini b/examples/bluetooth/nimble/blehr/sdkconfig.defaults.mini index 749ed66c83..9770e33935 100644 --- a/examples/bluetooth/nimble/blehr/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/blehr/sdkconfig.defaults.mini @@ -89,7 +89,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/bleprph/sdkconfig.defaults.mini b/examples/bluetooth/nimble/bleprph/sdkconfig.defaults.mini index 749ed66c83..9770e33935 100644 --- a/examples/bluetooth/nimble/bleprph/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/bleprph/sdkconfig.defaults.mini @@ -89,7 +89,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/examples/bluetooth/nimble/power_save/sdkconfig.defaults.mini b/examples/bluetooth/nimble/power_save/sdkconfig.defaults.mini index f8e34064fc..bead06d61a 100644 --- a/examples/bluetooth/nimble/power_save/sdkconfig.defaults.mini +++ b/examples/bluetooth/nimble/power_save/sdkconfig.defaults.mini @@ -99,7 +99,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=n CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=n CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=n -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n diff --git a/tools/ldgen/samples/sdkconfig b/tools/ldgen/samples/sdkconfig index 8ec30824f5..b5bf78599b 100644 --- a/tools/ldgen/samples/sdkconfig +++ b/tools/ldgen/samples/sdkconfig @@ -480,7 +480,6 @@ CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 # CONFIG_SPI_FLASH_VERIFY_WRITE= CONFIG_SPI_FLASH_ENABLE_COUNTERS= -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS= CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=