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

Merge branch 'fix/build_when_rom_patch_disable' into 'master'

Browse Source 
fix(spi_flash): Fix build fail when rom_patch config disabled

Closes IDFGH-14455

See merge request espressif/esp-idf!36521
This commit is contained in:
C.S.M
2025-01-23 14:53:12 +08:00
parent 1d0fa29970 073bc00739
commit 0cc16717b6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/esp_rom/patches/esp_rom_spiflash.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -24,8 +24,6 @@
#define SPI_IDX 1
#if CONFIG_SPI_FLASH_ROM_DRIVER_PATCH
#if CONFIG_IDF_TARGET_ESP32
extern esp_rom_spiflash_chip_t g_rom_spiflash_chip;
@@ -111,6 +109,12 @@ __attribute__((__unused__)) esp_rom_spiflash_result_t esp_rom_spiflash_clear_bp(
}
esp_rom_spiflash_result_t esp_rom_spiflash_unlock(void) __attribute__((alias("esp_rom_spiflash_clear_bp")));
#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);
//only support spi1

1
components/spi_flash/test_apps/esp_flash/sdkconfig.ci.rom_patch Normal file
View File

@@ -0,0 +1 @@
CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n