Skip to content

Commit 8933844

Browse files
joerchanVge0rge
authored andcommitted
[nrf fromtree] 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]> (cherry picked from commit f5eecd5) Signed-off-by: Markus Swarowsky <[email protected]>
1 parent 34c55dd commit 8933844

File tree

5 files changed

+1
-6
lines changed

5 files changed

+1
-6
lines changed

modules/trusted-firmware-m/nordic_nrf/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ endif()
4848

4949
if (TFM_PARTITION_PLATFORM)
5050
install(FILES include/tfm_ioctl_api.h
51-
DESTINATION ${TFM_INSTALL_PATH}/interface/include)
51+
DESTINATION ${INSTALL_INTERFACE_INC_DIR})
5252
endif()
5353

5454
#========================= tfm_spm ============================================#

modules/trusted-firmware-m/nordic_nrf/include/tfm_ioctl_api.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include <limits.h>
1111
#include <stdint.h>
12-
#include <tfm_api.h>
1312
#include <tfm_platform_api.h>
1413

1514
/* Include core IOCTL services */

samples/tfm_integration/tfm_ipc/src/main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <zephyr/kernel.h>
88
#include <zephyr/sys/printk.h>
99

10-
#include "tfm_api.h"
1110
#include "tfm_ns_interface.h"
1211
#ifdef TFM_PSA_API
1312
#include "psa_manifest/sid.h"

samples/tfm_integration/tfm_secure_partition/dummy_partition/dummy_partition.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <psa/crypto.h>
88
#include <stdbool.h>
99
#include <stdint.h>
10-
#include "tfm_api.h"
1110

1211
#include "psa/service.h"
1312
#include "psa_manifest/tfm_dummy_partition.h"

samples/tfm_integration/tfm_secure_partition/src/dummy_partition.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include "tfm_api.h"
8-
97
psa_status_t dp_secret_digest(uint32_t secret_index,
108
void *p_digest,
119
size_t digest_size);

0 commit comments

Comments
 (0)