modules: mbedtls: properly guard PSA_CRYPTO_C

Instead of silently `#undef`ing PSA_CRYPTO_C when TF-M is in use, enforce that rule at the Kconfig level. Signed-off-by: Tomi Fontanilles <[email protected]>
nimams · Jul 8, 2024 · 83cd9f5 · 83cd9f5
1 parent 48dd5c9
commit 83cd9f5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
@@ -484,6 +484,7 @@ endchoice
 
 config MBEDTLS_PSA_CRYPTO_C
 	bool "Platform Security Architecture cryptography API"
+	depends on !BUILD_WITH_TFM
 	default y if UOSCORE || UEDHOC
 
 config MBEDTLS_USE_PSA_CRYPTO

diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h
@@ -514,8 +514,4 @@
 #include CONFIG_MBEDTLS_USER_CONFIG_FILE
 #endif
 
-#if defined(CONFIG_BUILD_WITH_TFM)
-#undef MBEDTLS_PSA_CRYPTO_C
-#endif
-
 #endif /* MBEDTLS_CONFIG_H */