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

Merge branch 'fix/ci_flash_counter' into 'master'

Browse Source 
fix(spi_flash): Fix spi_flash counter test on CI

See merge request espressif/esp-idf!27965
This commit is contained in:
C.S.M
2023-12-20 09:56:19 +08:00
parent 7f171f01b1 e7dd6bbcdf
commit eb7f6e5725
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/spi_flash/esp_flash_api.c
View File

@@ -1130,10 +1130,11 @@ FORCE_INLINE_ATTR esp_err_t s_encryption_write_lock(esp_flash_t *chip) {
} }
FORCE_INLINE_ATTR esp_err_t s_encryption_write_unlock(esp_flash_t *chip) { FORCE_INLINE_ATTR esp_err_t s_encryption_write_unlock(esp_flash_t *chip) {
esp_err_t err = rom_spiflash_api_funcs->end(chip, ESP_OK);
#if CONFIG_IDF_TARGET_ESP32S2 #if CONFIG_IDF_TARGET_ESP32S2
esp_crypto_dma_lock_release(); esp_crypto_dma_lock_release();
#endif //CONFIG_IDF_TARGET_ESP32S2 #endif //CONFIG_IDF_TARGET_ESP32S2
return rom_spiflash_api_funcs->end(chip, ESP_OK); return err;
} }
esp_err_t IRAM_ATTR esp_flash_write_encrypted(esp_flash_t *chip, uint32_t address, const void *buffer, uint32_t length) esp_err_t IRAM_ATTR esp_flash_write_encrypted(esp_flash_t *chip, uint32_t address, const void *buffer, uint32_t length)