summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Forissier <jerome@forissier.org>2021-01-06 15:41:53 +0100
committerJérôme Forissier <jerome@forissier.org>2021-01-07 15:39:02 +0100
commit450c1b15bdeeba92ce10f7833163219fef78f586 (patch)
tree3922e4bf75ca6ce53f6f540d9aa7a4c1b1655a2c
parentcfff3778dae05f06473d8d3870896a607d69dcef (diff)
shippable: remove useless CFG_CORE_ASLR=y for QEMU
Since commit 87372da451d4 ("Enable ASLR by default"), most platforms have ASLR turned on and do not need to explicitly set CFG_CORE_ASLR=y at build time. Remove the redundant settings in .shippable.yml. Note that CFG_CORE_ASLR=n is still build-tested by a few platforms such as rcar, rzg and zynqmp. Signed-off-by: Jerome Forissier <jerome@forissier.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
-rw-r--r--.shippable.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.shippable.yml b/.shippable.yml
index 31979cf0..9e4bd406 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -45,8 +45,8 @@ build:
- _make CFG_WITH_PAGER=y out/core/tee{,-pager,-pageable}.bin
- _make CFG_WITH_PAGER=y CFG_CRYPTOLIB_NAME=mbedtls CFG_CRYPTOLIB_DIR=lib/libmbedtls
- _make CFG_WITH_PAGER=y CFG_WITH_LPAE=y
- - _make CFG_WITH_LPAE=y CFG_CORE_ASLR=y
- - _make CFG_RPMB_FS=y CFG_CORE_ASLR=y
+ - _make CFG_WITH_LPAE=y
+ - _make CFG_RPMB_FS=y
- _make CFG_RPMB_FS=y CFG_RPMB_TESTKEY=y
- _make CFG_REE_FS=n CFG_RPMB_FS=y
- _make CFG_WITH_PAGER=y CFG_WITH_LPAE=y CFG_RPMB_FS=y CFG_DT=y CFG_TEE_CORE_LOG_LEVEL=1 CFG_TEE_CORE_DEBUG=y CFG_CC_OPT_LEVEL=0 CFG_DEBUG_INFO=y
@@ -56,7 +56,7 @@ build:
- _make CFG_TA_GPROF_SUPPORT=y CFG_FTRACE_SUPPORT=y CFG_SYSCALL_FTRACE=y CFG_ULIBS_MCOUNT=y
- _make CFG_SECURE_DATA_PATH=y
- _make CFG_REE_FS_TA_BUFFERED=y
- - _make PLATFORM=vexpress-qemu_armv8a CFG_CORE_ASLR=y
+ - _make PLATFORM=vexpress-qemu_armv8a
- _make PLATFORM=vexpress-qemu_armv8a COMPILER=clang
- _make PLATFORM=vexpress-qemu_armv8a CFG_WITH_PAGER=y
- _make PLATFORM=vexpress-qemu_armv8a CFG_FTRACE_SUPPORT=y CFG_ULIBS_MCOUNT=y CFG_ULIBS_SHARED=y