summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2020-12-29 18:02:06 +0100
committerJérôme Forissier <jerome@forissier.org>2021-01-05 15:21:06 +0100
commit313aa2a473173aaf2f5309e3e48e8f6a28abbad5 (patch)
tree9d6faab8b50cb889234ec440a708d8def18af3a2
parent9bbdacba1c6a79152da83b5529d99827fce579af (diff)
core: introduce CFG_ENABLE_EMBEDDED_TESTS
Introduces CFG_ENABLE_EMBEDDED_TESTS disabled by default. This flag is used to control the default value of all other embedded tests. This changes the default value of CFG_TEE_CORE_EMBED_INTERNAL_TESTS to 'n' since CFG_ENABLE_EMBEDDED_TESTS defaults to 'n'. A Shippable target is updated with CFG_ENABLE_EMBEDDED_TESTS=y to have these tests compiled in some configuration. Acked-by: Etienne Carriere <etienne.carriere@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-rw-r--r--.shippable.yml2
-rw-r--r--mk/config.mk6
2 files changed, 6 insertions, 2 deletions
diff --git a/.shippable.yml b/.shippable.yml
index 8a264bfd..6d68b52c 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -28,7 +28,7 @@ build:
- _make
- _make COMPILER=clang
- - _make CFG_TEE_CORE_LOG_LEVEL=4 CFG_TEE_CORE_DEBUG=y CFG_TEE_TA_LOG_LEVEL=4 CFG_CC_OPT_LEVEL=0 CFG_DEBUG_INFO=y
+ - _make CFG_TEE_CORE_LOG_LEVEL=4 CFG_TEE_CORE_DEBUG=y CFG_TEE_TA_LOG_LEVEL=4 CFG_CC_OPT_LEVEL=0 CFG_DEBUG_INFO=y CFG_ENABLE_EMBEDDED_TESTS=y
- _make CFG_TEE_CORE_LOG_LEVEL=0 CFG_TEE_CORE_DEBUG=n CFG_TEE_TA_LOG_LEVEL=0 CFG_DEBUG_INFO=n
- _make CFG_TEE_CORE_LOG_LEVEL=0
- _make CFG_TEE_CORE_MALLOC_DEBUG=y CFG_CORE_DEBUG_CHECK_STACKS=y
diff --git a/mk/config.mk b/mk/config.mk
index 9ea088f1..414ad62b 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -401,8 +401,12 @@ CFG_DTB_MAX_SIZE ?= 0x10000
# DTB using the standard fdt_overlay_apply() method.
CFG_EXTERNAL_DTB_OVERLAY ?= n
+# All embedded tests are supposed to be disabled by default, this flag
+# is used to control the default value of all other embedded tests
+CFG_ENABLE_EMBEDDED_TESTS ?= n
+
# Enable core self tests and related pseudo TAs
-CFG_TEE_CORE_EMBED_INTERNAL_TESTS ?= y
+CFG_TEE_CORE_EMBED_INTERNAL_TESTS ?= $(CFG_ENABLE_EMBEDDED_TESTS)
# This option enables OP-TEE to respond to SMP boot request: the Rich OS
# issues this to request OP-TEE to release secondaries cores out of reset,