commit d975184ef5e7cec347bd6edf70e6d89aee4186e6
author Ronald Cron <ronald.cron@arm.com> Tue Jan 14 11:27:14 2025 +0000
committer GitHub <noreply@github.com> Tue Jan 14 11:27:14 2025 +0000
tree e3c56abe6566f09ce58e9d506ee7659a1ebdf0bd
parent 6f834e947ff1ae7061ffc44deb2822d5cc207c21
parent b248b50c2da8e8cb3b969cac6246ad9fe147da5c

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

Simplify crypto config default path setting

scripts/config.py

diff --git a/scripts/config.py b/scripts/config.py
index 957127e..47d74ce 100755
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -286,11 +286,7 @@
     # 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,