diff options
| author | David Hu <david.hu@arm.com> | 2021-08-20 11:39:37 +0800 |
|---|---|---|
| committer | David Hu <david.hu@arm.com> | 2021-09-07 17:54:52 +0800 |
| commit | 52ff16ff7971bc1c03a5d7c63a250b012810be88 (patch) | |
| tree | f7dab10aaf01f31797768e8f7e6839ed77c54100 /config | |
| parent | 81e98db409e943d6e80a6612798066b33767dc9b (diff) | |
SPM: Refine TF-M secure log control
Refine the control logic of TF-M SPM log and SP log.
- If SP log level is higher than silence or TF-M regerssion tests are
enabled, enable SP raw log.
- If SP raw log is enabled or SPM log level is higher than silence,
enable SPM raw log.
Add a config file to complete the configure settings.
Change-Id: Ifc4e3c60e753bf464a12fb1037ef6a50b0470ff6
Signed-off-by: David Hu <david.hu@arm.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/set_config.cmake | 4 | ||||
| -rw-r--r-- | config/tfm_secure_log.cmake | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/config/set_config.cmake b/config/set_config.cmake index 941d386a1..63a7bc76a 100644 --- a/config/set_config.cmake +++ b/config/set_config.cmake @@ -59,3 +59,7 @@ include(lib/ext/tf-m-tests/tf-m-tests.cmake) if (TFM_NS_REG_TEST OR TFM_S_REG_TEST) include(${TFM_TEST_PATH}/config/set_config.cmake) endif() + +# Set secure log configs +# It also depends on regression test config. +include(config/tfm_secure_log.cmake) diff --git a/config/tfm_secure_log.cmake b/config/tfm_secure_log.cmake new file mode 100644 index 000000000..48ca1d676 --- /dev/null +++ b/config/tfm_secure_log.cmake @@ -0,0 +1,21 @@ +#------------------------------------------------------------------------------- +# Copyright (c) 2021, Arm Limited. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# +#------------------------------------------------------------------------------- + +# Secure regression tests also require SP log function +# Enable SP log raw dump when SP log level is higher than silence or TF-M +# regression test is enabled. +if ((NOT ${TFM_PARTITION_LOG_LEVEL} STREQUAL TFM_PARTITION_LOG_LEVEL_SILENCE) + OR TFM_S_REG_TEST OR TFM_NS_REG_TEST) + set(TFM_SP_LOG_RAW_ENABLED ON) +endif() + +# SP log relies on SPM log. +# Enable SPM log when SPM log level is higher than silence or SP log is active. +if ((NOT ${TFM_SPM_LOG_LEVEL} STREQUAL TFM_SPM_LOG_LEVEL_SILENCE) + OR TFM_SP_LOG_RAW_ENABLED) + set(TFM_SPM_LOG_RAW_ENABLED ON) +endif() |