From 14cb16a29710fe6b83ef04275f6516720731af07 Mon Sep 17 00:00:00 2001 From: Minos Galanakis Date: Tue, 3 Dec 2024 15:59:30 +0000 Subject: [PATCH] all-core: Optimised repo selection during pre-initialisation. Signed-off-by: Ronald Cron Signed-off-by: Minos Galanakis --- scripts/all-core.sh | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/scripts/all-core.sh b/scripts/all-core.sh index 5f490f161..be2bf69cb 100644 --- a/scripts/all-core.sh +++ b/scripts/all-core.sh @@ -153,26 +153,18 @@ pre_load_components () { pre_initialize_variables () { if in_mbedtls_repo; then CONFIG_H='include/mbedtls/mbedtls_config.h' - if [ -d tf-psa-crypto ]; then - CRYPTO_CONFIG_H='tf-psa-crypto/include/psa/crypto_config.h' - PSA_CORE_PATH='tf-psa-crypto/core' - BUILTIN_SRC_PATH='tf-psa-crypto/drivers/builtin/src' - if in_3_6_branch; then - CONFIG_TEST_DRIVER_H='tf-psa-crypto/tests/configs/config_test_driver.h' - else - CONFIG_TEST_DRIVER_H='tf-psa-crypto/tests/configs/crypto_config_test_driver.h' - fi - else + if in_3_6_branch; then CRYPTO_CONFIG_H='include/psa/crypto_config.h' # helper_armc6_build_test() relies on these being defined, # but empty if the paths don't exist (as in 3.6). PSA_CORE_PATH='' BUILTIN_SRC_PATH='' - if in_3_6_branch; then - CONFIG_TEST_DRIVER_H='tests/configs/config_test_driver.h' - else - CONFIG_TEST_DRIVER_H='tests/configs/crypto_config_test_driver.h' - fi + CONFIG_TEST_DRIVER_H='tests/configs/config_test_driver.h' + else + CRYPTO_CONFIG_H='tf-psa-crypto/include/psa/crypto_config.h' + PSA_CORE_PATH='tf-psa-crypto/core' + BUILTIN_SRC_PATH='tf-psa-crypto/drivers/builtin/src' + CONFIG_TEST_DRIVER_H='tf-psa-crypto/tests/configs/crypto_config_test_driver.h' fi config_files="$CONFIG_H $CRYPTO_CONFIG_H $CONFIG_TEST_DRIVER_H" else