diff --git a/CMakeLists.txt b/CMakeLists.txt index df4bf6bb2080..bb7ba467af87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,6 +368,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/include PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/builtin/include + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/everest/include PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/library PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/core PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/builtin/src) diff --git a/framework b/framework index 94599c0e3b50..ce1c04d44719 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 94599c0e3b5036e086446a51a3f79640f70f22f6 +Subproject commit ce1c04d44719cd2f0b0656d9680cc9e646101d9b diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d1338ea66f7d..b8aaffcc7b72 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,6 @@ set(libs ${mbedtls_target} + ${everest_target} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/tests/scripts/test_psa_constant_names.py b/tests/scripts/test_psa_constant_names.py index 6c402dcf20cb..8ed0fee4b6cb 100755 --- a/tests/scripts/test_psa_constant_names.py +++ b/tests/scripts/test_psa_constant_names.py @@ -163,6 +163,7 @@ def main(): parser.add_argument('--include', '-I', action='append', default=['tf-psa-crypto/include', 'tf-psa-crypto/drivers/builtin/include', + 'tf-psa-crypto/drivers/everest/include', 'include'], help='Directory for header files') parser.add_argument('--keep-c', diff --git a/tf-psa-crypto/drivers/p256-m/CMakeLists.txt b/tf-psa-crypto/drivers/p256-m/CMakeLists.txt index f097ed13a50a..c3d72647ca5f 100644 --- a/tf-psa-crypto/drivers/p256-m/CMakeLists.txt +++ b/tf-psa-crypto/drivers/p256-m/CMakeLists.txt @@ -10,6 +10,7 @@ target_include_directories(${p256m_target} $ $ $ + $ $ PRIVATE ${MBEDTLS_DIR}/library/ ${MBEDTLS_DIR}/tf-psa-crypto/core)