aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Forissier <jerome@forissier.org>2020-08-27 14:45:11 +0200
committerJérôme Forissier <jerome@forissier.org>2020-08-27 17:32:14 +0200
commit6347ed94717edad0cfb81cc7fe5cd3076a5dbee8 (patch)
treef4ba8936aa3023b6fce77113ada0756db01033d4
parentdf4db47b7aa1df35fcf40f73fb0df467e42aaff2 (diff)
downloadbuild-6347ed94717edad0cfb81cc7fe5cd3076a5dbee8.tar.gz
common.mk: set CFG_ARM64_core=n when COMPILE_S_KERNEL != 64
common.mk currently assumes that optee_os defaults to a 32-bit build for the TEE core, in other words that CFG_ARM64_core is not set by default and that only a 64-bit build requires setting CFG_ARM64_core=y. Let's set CFG_ARM64_core=n explicitly when a 32-bit build is desired. This will let platforms such as QEMUv8 (PLATFORM=vexpress-qemu_armv8a) to select a 64-bit core by default in optee_os which makes more sense since (1) build.git would not support 32-bit until parent commit ("qemu_v8: do not force COMPILE_S_KERNEL := 64"), and (2) 32-bit is usually tested with QEMU (PLATFORM=vexpress-qemu_virt). Signed-off-by: Jerome Forissier <jerome@forissier.org> Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
-rw-r--r--common.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/common.mk b/common.mk
index 9ea8f2a..225521a 100644
--- a/common.mk
+++ b/common.mk
@@ -191,6 +191,8 @@ endif
ifeq ($(COMPILE_S_KERNEL),64)
OPTEE_OS_COMMON_EXTRA_FLAGS += CFG_ARM64_core=y
+else
+OPTEE_OS_COMMON_EXTRA_FLAGS += CFG_ARM64_core=n
endif