mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'feat/esp_driver_dma_v6.0' into 'release/v6.0'
feat(dma): graduate the dma driver from esp_hw_support to esp_driver_dma (v6.0) See merge request espressif/esp-idf!45387
This commit is contained in:
@@ -5,7 +5,6 @@ idf_build_get_property(esp_tee_build ESP_TEE_BUILD)
|
||||
if(esp_tee_build)
|
||||
include(${COMPONENT_DIR}/esp_tee/esp_tee_mbedtls.cmake)
|
||||
return()
|
||||
|
||||
elseif(BOOTLOADER_BUILD) # TODO: IDF-11673
|
||||
if(CONFIG_MBEDTLS_USE_CRYPTO_ROM_IMPL_BOOTLOADER)
|
||||
set(include_dirs "${COMPONENT_DIR}/mbedtls/include"
|
||||
@@ -15,14 +14,14 @@ elseif(BOOTLOADER_BUILD) # TODO: IDF-11673
|
||||
|
||||
idf_component_register(SRCS "${srcs}"
|
||||
INCLUDE_DIRS "${include_dirs}"
|
||||
PRIV_REQUIRES hal)
|
||||
PRIV_REQUIRES esp_hal_dma)
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(NOT ${IDF_TARGET} STREQUAL "linux")
|
||||
set(priv_requires soc esp_hw_support)
|
||||
if(NOT BOOTLOADER_BUILD)
|
||||
list(APPEND priv_requires esp_pm)
|
||||
list(APPEND priv_requires esp_pm esp_driver_dma)
|
||||
set(requires esp_security)
|
||||
endif()
|
||||
endif()
|
||||
@@ -321,6 +320,10 @@ if(AES_PERIPHERAL_TYPE STREQUAL "dma")
|
||||
target_sources(tfpsacrypto PRIVATE "${AES_DMA_SRCS}")
|
||||
endif()
|
||||
|
||||
if(CONFIG_SOC_SHA_GDMA OR CONFIG_SOC_AES_GDMA)
|
||||
target_link_libraries(tfpsacrypto PRIVATE idf::esp_driver_dma)
|
||||
endif()
|
||||
|
||||
if((SHA_PERIPHERAL_TYPE STREQUAL "core" AND CONFIG_SOC_SHA_SUPPORT_DMA) OR AES_PERIPHERAL_TYPE STREQUAL "dma")
|
||||
target_link_libraries(tfpsacrypto PRIVATE idf::esp_mm)
|
||||
target_link_libraries(builtin PRIVATE idf::esp_mm)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
idf_component_get_property(heap_dir heap COMPONENT_DIR)
|
||||
|
||||
set(priv_requires esp_hw_support hal soc)
|
||||
set(priv_requires esp_hw_support esp_hal_dma)
|
||||
|
||||
set(include_dirs "${COMPONENT_DIR}/port/include"
|
||||
"${COMPONENT_DIR}/mbedtls/include"
|
||||
|
||||
Reference in New Issue
Block a user