Skip to content

Commit 94c386a

Browse files
committed
Update config paths in scripts
This commit updates the moved config paths in multiple script files. Signed-off-by: Harry Ramsey <[email protected]>
1 parent c89fa17 commit 94c386a

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

scripts/code_size_compare.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def detect_arch() -> str:
146146
sys.exit(1)
147147

148148
TFM_MEDIUM_CONFIG_H = 'configs/ext/tfm_mbedcrypto_config_profile_medium.h'
149-
TFM_MEDIUM_CRYPTO_CONFIG_H = 'configs/ext/crypto_config_profile_medium.h'
149+
TFM_MEDIUM_CRYPTO_CONFIG_H = 'tf-psa-crypto/configs/ext/crypto_config_profile_medium.h'
150150

151151
CONFIG_H = 'include/mbedtls/mbedtls_config.h'
152152
CRYPTO_CONFIG_H = 'tf-psa-crypto/include/psa/crypto_config.h'

tests/scripts/components-compiler.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ support_build_tfm_armcc () {
1616
component_build_tfm_armcc () {
1717
# test the TF-M configuration can build cleanly with various warning flags enabled
1818
cp configs/config-tfm.h "$CONFIG_H"
19-
cp configs/ext/crypto_config_profile_medium.h "$CRYPTO_CONFIG_H"
19+
cp tf-psa-crypto/configs/ext/crypto_config_profile_medium.h "$CRYPTO_CONFIG_H"
2020

2121
msg "build: TF-M config, armclang armv7-m thumb2"
2222
helper_armc6_build_test "--target=arm-arm-none-eabi -march=armv7-m -mthumb -Os -std=c99 -Werror -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused -I../framework/tests/include/spe"

tests/scripts/components-configuration-crypto.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ component_test_full_no_ccm_star_no_tag () {
412412
component_test_config_symmetric_only () {
413413
msg "build: configs/config-symmetric-only.h"
414414
MBEDTLS_CONFIG="configs/config-symmetric-only.h"
415-
CRYPTO_CONFIG="configs/crypto-config-symmetric-only.h"
415+
CRYPTO_CONFIG="tf-psa-crypto/configs/crypto-config-symmetric-only.h"
416416
CC=$ASAN_CC cmake -DMBEDTLS_CONFIG_FILE="$MBEDTLS_CONFIG" -DTF_PSA_CRYPTO_CONFIG_FILE="$CRYPTO_CONFIG" -D CMAKE_BUILD_TYPE:String=Asan .
417417
make
418418

@@ -1334,7 +1334,7 @@ component_test_psa_crypto_config_reference_ecc_ffdh_no_bignum () {
13341334
component_test_tfm_config_as_is () {
13351335
msg "build: configs/config-tfm.h"
13361336
MBEDTLS_CONFIG="configs/config-tfm.h"
1337-
CRYPTO_CONFIG="configs/ext/crypto_config_profile_medium.h"
1337+
CRYPTO_CONFIG="tf-psa-crypto/configs/ext/crypto_config_profile_medium.h"
13381338
CC=$ASAN_CC cmake -DMBEDTLS_CONFIG_FILE="$MBEDTLS_CONFIG" -DTF_PSA_CRYPTO_CONFIG_FILE="$CRYPTO_CONFIG" -D CMAKE_BUILD_TYPE:String=Asan .
13391339
make
13401340

@@ -1348,7 +1348,7 @@ component_test_tfm_config_as_is () {
13481348
common_tfm_config () {
13491349
# Enable TF-M config
13501350
cp configs/config-tfm.h "$CONFIG_H"
1351-
cp configs/ext/crypto_config_profile_medium.h "$CRYPTO_CONFIG_H"
1351+
cp tf-psa-crypto/configs/ext/crypto_config_profile_medium.h "$CRYPTO_CONFIG_H"
13521352

13531353
# Config adjustment for better test coverage in our environment.
13541354
# This is not needed just to build and pass tests.
@@ -2097,7 +2097,7 @@ component_test_ccm_aes_sha256 () {
20972097

20982098
# Setting a blank config disables everyhing in the library side.
20992099
echo '#define MBEDTLS_CONFIG_H ' >"$CONFIG_H"
2100-
cp configs/crypto-config-ccm-aes-sha256.h "$CRYPTO_CONFIG_H"
2100+
cp tf-psa-crypto/configs/crypto-config-ccm-aes-sha256.h "$CRYPTO_CONFIG_H"
21012101

21022102
make
21032103
msg "test: CCM + AES + SHA256 configuration"

tests/scripts/components-configuration.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ component_build_tfm () {
236236
# the configuration that works on mainstream platforms is in
237237
# configs/config-tfm.h, tested via test-ref-configs.pl.
238238
cp configs/config-tfm.h "$CONFIG_H"
239-
cp configs/ext/crypto_config_profile_medium.h "$CRYPTO_CONFIG_H"
239+
cp tf-psa-crypto/configs/ext/crypto_config_profile_medium.h "$CRYPTO_CONFIG_H"
240240

241241
msg "build: TF-M config, clang, armv7-m thumb2"
242242
make lib CC="clang" CFLAGS="--target=arm-linux-gnueabihf -march=armv7-m -mthumb -Os -std=c99 -Werror -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused -I../framework/tests/include/spe"

0 commit comments

Comments
 (0)