espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/flash_clear_WEL_rom_patch' into 'master'

Browse Source 
spi_flash: ROM patch for clearing WEL bit for unlock

See merge request espressif/esp-idf!10540
This commit is contained in:
Michael (XIAO Xufeng)
2020-09-28 15:36:19 +08:00
parent 01330f40b7 f448e97fea
commit 4e781d1263
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/spi_flash/esp32/spi_flash_rom_patch.c
View File

@@ -101,11 +101,13 @@ esp_rom_spiflash_result_t esp_rom_spiflash_unlock(void)
while (REG_READ(SPI_CMD_REG(SPI_IDX)) != 0) { while (REG_READ(SPI_CMD_REG(SPI_IDX)) != 0) {
} }
esp_rom_spiflash_wait_idle(&g_rom_spiflash_chip); esp_rom_spiflash_wait_idle(&g_rom_spiflash_chip);
if (esp_rom_spiflash_write_status(&g_rom_spiflash_chip, new_status) != ESP_ROM_SPIFLASH_RESULT_OK) { esp_rom_spiflash_result_t ret = esp_rom_spiflash_write_status(&g_rom_spiflash_chip, new_status);
return ESP_ROM_SPIFLASH_RESULT_ERR; // WEL bit should be cleared after operations regardless of writing succeed or not.
esp_rom_spiflash_wait_idle(&g_rom_spiflash_chip);
REG_WRITE(SPI_CMD_REG(SPI_IDX), SPI_FLASH_WRDI);
while (REG_READ(SPI_CMD_REG(SPI_IDX)) != 0) {
} }
return ret;
return ESP_ROM_SPIFLASH_RESULT_OK;
} }
#if CONFIG_SPI_FLASH_ROM_DRIVER_PATCH #if CONFIG_SPI_FLASH_ROM_DRIVER_PATCH