Merge pull request #9902 from ronald-cron-arm/crypto-config-default-path-3.6

Simplify crypto config default path setting
This commit is contained in:
Ronald Cron 2025-01-14 11:27:14 +00:00 committed by GitHub
commit d975184ef5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -286,11 +286,7 @@ class CryptoConfigFile(config_common.ConfigFile):
# Temporary, while Mbed TLS does not just rely on the TF-PSA-Crypto
# build system to build its crypto library. When it does, the
# condition can just be removed.
_path_in_tree = ('include/psa/crypto_config.h'
if not os.path.isdir(os.path.join(os.path.dirname(__file__),
os.pardir,
'tf-psa-crypto')) else
'tf-psa-crypto/include/psa/crypto_config.h')
_path_in_tree = 'include/psa/crypto_config.h'
default_path = [_path_in_tree,
os.path.join(os.path.dirname(__file__),
os.pardir,