Merge branch 'bugfix/s3_dma_enable_crypto' into 'master'

sha: dont enable/disable GDMA when enable/disable SHA module

See merge request espressif/esp-idf!12247
pull/7261/head
Angus Gratton 2021-02-04 11:30:10 +08:00
commit 6252446b7d
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -181,10 +181,10 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
case PERIPH_SHA_MODULE:
if (enable == true) {
// Clear reset on digital signature and HMAC, otherwise SHA is held in reset
return (SYSTEM_CRYPTO_SHA_RST | SYSTEM_CRYPTO_DS_RST | SYSTEM_CRYPTO_HMAC_RST | SYSTEM_DMA_RST) ;
return (SYSTEM_CRYPTO_SHA_RST | SYSTEM_CRYPTO_DS_RST | SYSTEM_CRYPTO_HMAC_RST) ;
} else {
// Don't assert reset on secure boot, otherwise AES is held in reset
return SYSTEM_CRYPTO_SHA_RST | SYSTEM_DMA_RST;
return SYSTEM_CRYPTO_SHA_RST;
}
case PERIPH_RSA_MODULE:
if (enable == true) {