commit 05ba9124b7fc2af5e8a19cfd9c4f9ec73d74a504
author Ronald Cron <ronald.cron@arm.com> Mon Jun 17 14:25:26 2024 +0200
committer Ronald Cron <ronald.cron@arm.com> Mon Jul 01 14:59:35 2024 +0200
tree 8e7ebc76cb6fdc5601b844ad355fa04bd2f5cee1
parent d6d7f3ce64a95d2c2c53c382a88f10704694e63e

Adapt libraries installation

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

Makefile

diff --git a/Makefile b/Makefile
index b10ef62..67ad0b7 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,7 @@
 install: no_test
 	mkdir -p $(DESTDIR)/include/mbedtls
 	cp -rp include/mbedtls $(DESTDIR)/include
+	cp -rp tf-psa-crypto/drivers/builtin/include/mbedtls $(DESTDIR)/include
 	mkdir -p $(DESTDIR)/include/psa
 	cp -rp tf-psa-crypto/include/psa $(DESTDIR)/include
 

tf-psa-crypto/include/CMakeLists.txt

diff --git a/tf-psa-crypto/include/CMakeLists.txt b/tf-psa-crypto/include/CMakeLists.txt
index dea92fe..bca86ff 100644
--- a/tf-psa-crypto/include/CMakeLists.txt
+++ b/tf-psa-crypto/include/CMakeLists.txt
@@ -1,14 +1,17 @@
-option(INSTALL_PSA_CRYPTO_HEADERS "Install PSA Crypto headers." ON)
+option(INSTALL_TF_PSA_CRYPTO_HEADERS "Install TF PSA Crypto headers." ON)
 
-if(INSTALL_PSA_CRYPTO_HEADERS)
-
+if(INSTALL_TF_PSA_CRYPTO_HEADERS)
     file(GLOB psa_headers "psa/*.h")
+    file(GLOB mbedtls_crypto_headers "../drivers/builtin/include/mbedtls/*.h")
 
     install(FILES ${psa_headers}
         DESTINATION include/psa
         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 
-endif(INSTALL_PSA_CRYPTO_HEADERS)
+    install(FILES ${mbedtls_crypto_headers}
+        DESTINATION include/mbedtls
+        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+endif(INSTALL_TF_PSA_CRYPTO_HEADERS)
 
 # Make includes available in an out-of-source build. ssl-opt.sh requires it.
 if (ENABLE_TESTING AND NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})