Skip to content

Commit 8920f43

Browse files
Rajkumar Kanagarajcarlescufi
Rajkumar Kanagaraj
authored andcommitted
modules: trusted-firmware-m: update val, pal, test static lib path
Previously val_nspe.a, pal_nspe.a, test_combine.a created under tfm binary directory (${TFM_BINARY_DIR}/app/psa_api_tests/) now from TFM 1.6 it is generated to the respective tfm binary directory with parent directory (${TFM_BINARY_DIR}/tf-m-tests/app/psa_api_tests), update the CMake accordingly. Signed-off-by: Rajkumar Kanagaraj <[email protected]>
1 parent 2e6cd25 commit 8920f43

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

modules/trusted-firmware-m/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@ if (CONFIG_BUILD_WITH_TFM)
152152
set(PLATFORM_NS_FILE ${TFM_BINARY_DIR}/platform/libplatform_ns.a)
153153

154154
if (TFM_PSA_TEST_SUITE)
155-
set(PSA_TEST_VAL_FILE ${TFM_BINARY_DIR}/app/psa_api_tests/val/val_nspe.a)
156-
set(PSA_TEST_PAL_FILE ${TFM_BINARY_DIR}/app/psa_api_tests/platform/pal_nspe.a)
155+
set(PSA_TEST_VAL_FILE ${TFM_BINARY_DIR}/tf-m-tests/app/psa_api_tests/val/val_nspe.a)
156+
set(PSA_TEST_PAL_FILE ${TFM_BINARY_DIR}/tf-m-tests/app/psa_api_tests/platform/pal_nspe.a)
157157
set(COMBINE_DIR_STORAGE storage)
158158
set(COMBINE_DIR_PROTECTED_STORAGE storage)
159159
set(COMBINE_DIR_INTERNAL_TRUSTED_STORAGE storage)
160160
set(COMBINE_DIR_CRYPTO crypto)
161161
set(COMBINE_DIR_INITIAL_ATTESTATION initial_attestation)
162-
set(PSA_TEST_COMBINE_FILE ${TFM_BINARY_DIR}/app/psa_api_tests/dev_apis/${COMBINE_DIR_${TFM_PSA_TEST_SUITE}}/test_combine.a)
162+
set(PSA_TEST_COMBINE_FILE ${TFM_BINARY_DIR}/tf-m-tests/app/psa_api_tests/dev_apis/${COMBINE_DIR_${TFM_PSA_TEST_SUITE}}/test_combine.a)
163163
endif()
164164

165165
if(CONFIG_TFM_BL2)

0 commit comments

Comments
 (0)