tf-m: Use the driver contexts from nrf_security

And not from the Oberon PSA core headers since the Oberon
PSA core ones doesn't include the drivers for the hardware
crypto accelerators.

Also make sure that TF-M  always get the nrf_security inlcludes
first in order.

Signed-off-by: Georgios Vasilakis <[email protected]>

Author: Vge0rge

modules/trusted-firmware-m/tfm_boards/external_core.cmake

@@ -38,6 +38,7 @@ if(TARGET psa_interface)
     set(EXTERNAL_CRYPTO_CORE_HANDLED_PSA_INTERFACE True)
     target_include_directories(psa_interface
         INTERFACE
+            ${NRF_SECURITY_ROOT}/include
             $<BUILD_INTERFACE:${OBERON_PSA_CORE_PATH}/include>
             # Oberon library
             ${OBERON_PSA_CORE_PATH}/library

modules/trusted-firmware-m/tfm_boards/external_core_install.cmake

@@ -11,9 +11,6 @@ install(
       ${OBERON_PSA_CORE_PATH}/include/psa/crypto_adjust_config_synonyms.h
       ${OBERON_PSA_CORE_PATH}/include/psa/crypto_compat.h
       ${OBERON_PSA_CORE_PATH}/include/psa/crypto_driver_common.h
-      ${OBERON_PSA_CORE_PATH}/include/psa/crypto_driver_contexts_composites.h
-      ${OBERON_PSA_CORE_PATH}/include/psa/crypto_driver_contexts_key_derivation.h
-      ${OBERON_PSA_CORE_PATH}/include/psa/crypto_driver_contexts_primitives.h
       ${OBERON_PSA_CORE_PATH}/include/psa/crypto_extra.h
       ${OBERON_PSA_CORE_PATH}/include/psa/crypto_legacy.h
       ${OBERON_PSA_CORE_PATH}/include/psa/crypto_platform.h
@@ -23,6 +20,10 @@ install(
       ${OBERON_PSA_CORE_PATH}/include/psa/crypto_types.h
       ${OBERON_PSA_CORE_PATH}/include/psa/crypto_values.h
       ${OBERON_PSA_CORE_PATH}/include/psa/crypto.h
+      # The driver contexts are taken from nrf_security
+      ${NRF_SECURITY_ROOT}/include/psa/crypto_driver_contexts_key_derivation.h
+      ${NRF_SECURITY_ROOT}/include/psa/crypto_driver_contexts_primitives.h
+      ${NRF_SECURITY_ROOT}/include/psa/crypto_driver_contexts_composites.h
   DESTINATION ${INSTALL_INTERFACE_INC_DIR}/psa
 )