Config: Share one project config file among arch tests
There is only little difference among project config files for different
arch tests. To keep code clean, it is good enough to share a single
project config file among arch test suites.
Library tfm_config is set before loading PSA configs, to make sure that
arch test related compile definitions can be correctly added to tfm_config.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ia082199a839718bcecc1273d9b8a42e4608ded55
diff --git a/config/set_config.cmake b/config/set_config.cmake
index 170fa58..a29a866 100644
--- a/config/set_config.cmake
+++ b/config/set_config.cmake
@@ -25,6 +25,9 @@
include(${TFM_EXTRA_CONFIG_PATH})
endif()
+# Set TF-M project config header file
+add_library(tfm_config INTERFACE)
+
# Load PSA config, setting options not already set
if (TEST_PSA_API)
include(config/tests/config_test_psa_api.cmake)
@@ -105,8 +108,6 @@
# It also depends on regression test config.
include(config/tfm_secure_log.cmake)
-add_library(tfm_config INTERFACE)
-
# Set user defined TF-M config header file
if(PROJECT_CONFIG_HEADER_FILE)
if(NOT EXISTS ${PROJECT_CONFIG_HEADER_FILE})
diff --git a/config/tests/config_test_psa_api.cmake b/config/tests/config_test_psa_api.cmake
index d6b7944..d458202 100644
--- a/config/tests/config_test_psa_api.cmake
+++ b/config/tests/config_test_psa_api.cmake
@@ -34,8 +34,9 @@
set(TFM_PARTITION_PLATFORM ON CACHE BOOL "Enable Platform partition")
endif()
-if ("${TEST_PSA_API}" STREQUAL "CRYPTO")
- set(PROJECT_CONFIG_HEADER_FILE "${CMAKE_SOURCE_DIR}/config/tests/config_test_psa_api_crypto.h" CACHE FILEPATH "User defined header file for TF-M config")
-else()
- set(PROJECT_CONFIG_HEADER_FILE "${CMAKE_SOURCE_DIR}/config/tests/config_test_psa_api.h" CACHE FILEPATH "User defined header file for TF-M config")
-endif()
+target_compile_definitions(tfm_config
+ INTERFACE
+ $<$<STREQUAL:${TEST_PSA_API},CRYPTO>:TEST_PSA_API_CRYPTO>
+)
+
+set(PROJECT_CONFIG_HEADER_FILE "${CMAKE_SOURCE_DIR}/config/tests/config_test_psa_api.h" CACHE FILEPATH "User defined header file for TF-M config")
diff --git a/config/tests/config_test_psa_api.h b/config/tests/config_test_psa_api.h
index c160ee5..3e37a32 100644
--- a/config/tests/config_test_psa_api.h
+++ b/config/tests/config_test_psa_api.h
@@ -109,7 +109,15 @@
#define ITS_VALIDATE_METADATA_FROM_FLASH 1
/* The maximum asset size to be stored in the Internal Trusted Storage */
+#ifdef TEST_PSA_API_CRYPTO
+/*
+ * When building for the PSA Crypto API tests, ensure the ITS max asset size is
+ * set to at least the size of the largest asset created by the tests.
+ */
+#define ITS_MAX_ASSET_SIZE 1229
+#else
#define ITS_MAX_ASSET_SIZE 512
+#endif
/*
* Size of the ITS internal data transfer buffer
diff --git a/config/tests/config_test_psa_api_crypto.h b/config/tests/config_test_psa_api_crypto.h
deleted file mode 100644
index b415817..0000000
--- a/config/tests/config_test_psa_api_crypto.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-#ifndef __CONFIG_BASE_H__
-#define __CONFIG_BASE_H__
-
-/* Platform Partition Configs */
-
-/* Size of input buffer in platform service */
-#define PLATFORM_SERVICE_INPUT_BUFFER_SIZE 64
-
-/* Size of output buffer in platform service */
-#define PLATFORM_SERVICE_OUTPUT_BUFFER_SIZE 64
-
-/* The stack size of the Platform Secure Partition */
-#define PLATFORM_SP_STACK_SIZE 0x500
-
-/* Disable Non-volatile counter module */
-#define PLATFORM_NV_COUNTER_MODULE_DISABLED 0
-
-/* Crypto Partition Configs */
-
-/*
- * Heap size for the crypto backend
- * CRYPTO_ENGINE_BUF_SIZE needs to be much larger for PSA API tests.
- */
-#define CRYPTO_ENGINE_BUF_SIZE 0x5000
-
-/* The max number of concurrent operations that can be active (allocated) at any time in Crypto */
-#define CRYPTO_CONC_OPER_NUM 8
-
-/* Enable PSA Crypto random number generator module */
-#define CRYPTO_RNG_MODULE_ENABLED 1
-
-/* Enable PSA Crypto Key module */
-#define CRYPTO_KEY_MODULE_ENABLED 1
-
-/* Enable PSA Crypto AEAD module */
-#define CRYPTO_AEAD_MODULE_ENABLED 1
-
-/* Enable PSA Crypto MAC module */
-#define CRYPTO_MAC_MODULE_ENABLED 1
-
-/* Enable PSA Crypto Hash module */
-#define CRYPTO_HASH_MODULE_ENABLED 1
-
-/* Enable PSA Crypto Cipher module */
-#define CRYPTO_CIPHER_MODULE_ENABLED 1
-
-/* Enable PSA Crypto asymmetric key signature module */
-#define CRYPTO_ASYM_SIGN_MODULE_ENABLED 1
-
-/* Enable PSA Crypto asymmetric key encryption module */
-#define CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED 1
-
-/* Enable PSA Crypto key derivation module */
-#define CRYPTO_KEY_DERIVATION_MODULE_ENABLED 1
-
-/* Default size of the internal scratch buffer used for PSA FF IOVec allocations */
-#define CRYPTO_IOVEC_BUFFER_SIZE 5120
-
-/* Use stored NV seed to provide entropy */
-#define CRYPTO_NV_SEED 1
-
-/*
- * Only enable multi-part operations in Hash, MAC, AEAD and symmetric ciphers,
- * to optimize memory footprint in resource-constrained devices.
- */
-#define CRYPTO_SINGLE_PART_FUNCS_DISABLED 0
-
-/* The stack size of the Crypto Secure Partition */
-#define CRYPTO_STACK_SIZE 0x1B00
-
-/* FWU Partition Configs */
-
-/* Size of the FWU internal data transfer buffer */
-#define TFM_FWU_BUF_SIZE PSA_FWU_MAX_WRITE_SIZE
-
-/* The stack size of the Firmware Update Secure Partition */
-#define FWU_STACK_SIZE 0x600
-
-/* Attest Partition Configs */
-
-/* Include optional claims in initial attestation token */
-#define ATTEST_INCLUDE_OPTIONAL_CLAIMS 1
-
-/* Include COSE key-id in initial attestation token */
-#define ATTEST_INCLUDE_COSE_KEY_ID 0
-
-/* The stack size of the Initial Attestation Secure Partition */
-#define ATTEST_STACK_SIZE 0x700
-
-/* Set the initial attestation token profile */
-#define ATTEST_TOKEN_PROFILE_PSA_IOT_1 1
-
-/* ITS Partition Configs */
-
-/* Create flash FS if it doesn't exist for Internal Trusted Storage partition */
-#define ITS_CREATE_FLASH_LAYOUT 1
-
-/* Enable emulated RAM FS for platforms that don't have flash for Internal Trusted Storage partition */
-#define ITS_RAM_FS 0
-
-/* Validate filesystem metadata every time it is read from flash */
-#define ITS_VALIDATE_METADATA_FROM_FLASH 1
-
-/*
- * The maximum asset size to be stored in the Internal Trusted Storage
- * When building for the PSA Crypto API tests, ensure the ITS max asset size is
- * set to at least the size of the largest asset created by the tests.
- */
-#define ITS_MAX_ASSET_SIZE 1229
-
-/*
- * Size of the ITS internal data transfer buffer
- * (Default to the max asset size so that all requests can be handled in one iteration.)
- */
-#define ITS_BUF_SIZE ITS_MAX_ASSET_SIZE
-
-/* The maximum number of assets to be stored in the Internal Trusted Storage */
-#define ITS_NUM_ASSETS 10
-
-/* The stack size of the Internal Trusted Storage Secure Partition */
-#define ITS_STACK_SIZE 0x720
-
-/* PS Partition Configs */
-
-/* Create flash FS if it doesn't exist for Protected Storage partition */
-#define PS_CREATE_FLASH_LAYOUT 1
-
-/* Enable emulated RAM FS for platforms that don't have flash for Protected Storage partition */
-#define PS_RAM_FS 0
-
-/* Enable rollback protection for Protected Storage partition */
-#define PS_ROLLBACK_PROTECTION 1
-
-/* Validate filesystem metadata every time it is read from flash */
-#define PS_VALIDATE_METADATA_FROM_FLASH 1
-
-/* The maximum asset size to be stored in the Protected Storage */
-#define PS_MAX_ASSET_SIZE 2048
-
-/* The maximum number of assets to be stored in the Protected Storage */
-#define PS_NUM_ASSETS 10
-
-/* The stack size of the Protected Storage Secure Partition */
-#define PS_STACK_SIZE 0x700
-
-/* SPM Partition Configs */
-
-/* The maximal number of secure services that are connected or requested at the same time */
-#define CONFIG_TFM_CONN_HANDLE_MAX_NUM 8
-
-/* Enable the doorbell APIs */
-#define CONFIG_TFM_DOORBELL_API 1
-
-#endif /* __CONFIG_BASE_H__ */