aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Forissier <jerome@forissier.org>2020-08-27 10:55:10 +0200
committerJérôme Forissier <jerome@forissier.org>2020-08-27 17:32:14 +0200
commitdf4db47b7aa1df35fcf40f73fb0df467e42aaff2 (patch)
tree9886bb8df8dab2a23acc13d8249049564be07033
parentce0674275afc9837e593cca45980a7644b0bcc39 (diff)
downloadbuild-df4db47b7aa1df35fcf40f73fb0df467e42aaff2.tar.gz
qemu_v8: do not force COMPILE_S_KERNEL := 64
The 32-bit TEE core works fine on the QEMUv8 platform so set COMPILE_S_KERNEL to 64 by default but let the user change this value to 32 if needed ('make COMPILE_S_KERNEL=32 COMPILE_S_USER=32'). This also implies removing 'CFG_ARM64_core=y' which is currently added unconditionally to OPTEE_OS_COMMON_FLAGS by qemu_v8.mk. It is already taken care of by common.mk. Signed-off-by: Jerome Forissier <jerome@forissier.org> Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
-rw-r--r--qemu_v8.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu_v8.mk b/qemu_v8.mk
index 333a80c..8a7ee48 100644
--- a/qemu_v8.mk
+++ b/qemu_v8.mk
@@ -6,7 +6,7 @@
COMPILE_NS_USER ?= 64
override COMPILE_NS_KERNEL := 64
COMPILE_S_USER ?= 64
-override COMPILE_S_KERNEL := 64
+COMPILE_S_KERNEL ?= 64
################################################################################
# If you change this, you MUST run `make arm-tf-clean` first before rebuilding
@@ -165,7 +165,7 @@ linux-cleaner: linux-cleaner-common
################################################################################
# OP-TEE
################################################################################
-OPTEE_OS_COMMON_FLAGS += CFG_ARM64_core=y DEBUG=$(DEBUG)
+OPTEE_OS_COMMON_FLAGS += DEBUG=$(DEBUG)
optee-os: optee-os-common
optee-os-clean: optee-os-clean-common