tfm: nordic_nrf: Remove include of tfm_api.h, update install path

Update install path of tfm_ioctl_api.h, remove include of tfm_api.h Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: Markus Swarowsky <[email protected]>
zephyrproject-rtos · Dec 12, 2023 · c0fdc98 · c0fdc98
1 parent 58c3598
commit c0fdc98
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 6 deletions.
diff --git a/modules/trusted-firmware-m/nordic_nrf/CMakeLists.txt b/modules/trusted-firmware-m/nordic_nrf/CMakeLists.txt
@@ -48,7 +48,7 @@ endif()
 
 if (TFM_PARTITION_PLATFORM)
 install(FILES       include/tfm_ioctl_api.h
-        DESTINATION ${TFM_INSTALL_PATH}/interface/include)
+        DESTINATION ${INSTALL_INTERFACE_INC_DIR})
 endif()
 
 #========================= tfm_spm ============================================#

diff --git a/modules/trusted-firmware-m/nordic_nrf/include/tfm_ioctl_api.h b/modules/trusted-firmware-m/nordic_nrf/include/tfm_ioctl_api.h
@@ -9,7 +9,6 @@
 
 #include <limits.h>
 #include <stdint.h>
-#include <tfm_api.h>
 #include <tfm_platform_api.h>
 
 /* Include core IOCTL services */

diff --git a/samples/tfm_integration/tfm_ipc/src/main.c b/samples/tfm_integration/tfm_ipc/src/main.c
@@ -7,7 +7,6 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
-#include "tfm_api.h"
 #include "tfm_ns_interface.h"
 #ifdef TFM_PSA_API
 #include "psa_manifest/sid.h"

diff --git a/samples/tfm_integration/tfm_secure_partition/dummy_partition/dummy_partition.c b/samples/tfm_integration/tfm_secure_partition/dummy_partition/dummy_partition.c
@@ -7,7 +7,6 @@
 #include <psa/crypto.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "tfm_api.h"
 
 #include "psa/service.h"
 #include "psa_manifest/tfm_dummy_partition.h"

diff --git a/samples/tfm_integration/tfm_secure_partition/src/dummy_partition.h b/samples/tfm_integration/tfm_secure_partition/src/dummy_partition.h
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "tfm_api.h"
-
 psa_status_t dp_secret_digest(uint32_t secret_index,
 			      void *p_digest,
 			      size_t digest_size);