tf-m: Fix build warnings

Fixes warnings emitted by cmake for tf-m builds. Ref: NCSDK-28092 Signed-off-by: Vidar Lillebø <[email protected]>
nrfconnect · Jun 21, 2024 · 8b1fd61 · 8b1fd61
1 parent d257754
commit 8b1fd61
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt
@@ -231,9 +231,6 @@ set_property(TARGET zephyr_property_target
   APPEND PROPERTY TFM_CMAKE_OPTIONS
     # Pass Zephyr Python to TF-M so both uses identical Python.
     -DPython3_EXECUTABLE=${Python3_EXECUTABLE}
-    # TF-M calls back into nrf_security which loads Zephyr Python lookup
-    # mechanism, thus also set PYTHON_PREFER.
-    -DPYTHON_PREFER=${Python3_EXECUTABLE}
 )
 
 # CONN_HANDLE_MAX_NUM is only needed if IPC mode is used

diff --git a/subsys/nrf_security/cmake/config_to_tf-m.cmake b/subsys/nrf_security/cmake/config_to_tf-m.cmake
@@ -26,7 +26,6 @@ set_property(TARGET zephyr_property_target
     PROPERTY TFM_CMAKE_OPTIONS
       -DTFM_MBEDCRYPTO_CONFIG_PATH:STRING=${CONFIG_MBEDTLS_CFG_FILE}
       -DTFM_MBEDCRYPTO_PSA_CRYPTO_CONFIG_PATH:STRING=${CMAKE_CURRENT_BINARY_DIR}/src/include/generated/${CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE}
-      -DMBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE:STRING=${CMAKE_CURRENT_BINARY_DIR}/src/include/generated/${CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE}
 )
 
 if(NOT ${CONFIG_MBEDTLS_USER_CONFIG_FILE} STREQUAL "nrf-config-user-empty.h" )

diff --git a/west.yml b/west.yml
@@ -63,7 +63,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 297b00dade9f72873f9dd9147008e4a90516a3ff
+      revision: 3d2f1c7f0558d76b24afdabbaff6d36ea96db768
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -152,7 +152,7 @@ manifest:
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m
-      revision: v2.0.0-ncs2-rc2
+      revision: 553c47a6a4c490bc799f2b455dfd0ebe3a49b0d0
     - name: psa-arch-tests
       repo-path: sdk-psa-arch-tests
       path: modules/tee/tf-m/psa-arch-tests