optee-client:
- Disable CFG_ENABLE_SYSTEMD, because PTXdist ships its own
tee-supplicant.service instead of the upstream service.
- Disable CFG_ENABLE_UDEV, because PTXdist unconditionally enables the
service instead of starting it by udev.
- Disable CFG_USE_PKGCONFIG, because the option is for lookup of the
path where to install the udev rule and systemd.service. PTXdist
currently blocks the path lookup using pkgconfig.
optee-examples:
- Since Commit bbaca7ef34c8 ("Makefile: Avoid variable override"), the
HOST_CROSS_COMPILE isn't used as general CROSS_COMPILE, anymore. Thus,
the TA_CROSS_COMPILE must be set explicitly.
Signed-off-by: Michael Tretter <[email protected]>
---
rules/optee-client.make | 7 +++++--
rules/optee-examples.make | 7 ++++---
rules/optee-test.make | 4 ++--
rules/optee.make | 4 ++--
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/rules/optee-client.make b/rules/optee-client.make
index c884000d688c..96495028bad5 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client
#
# Paths and names
#
-OPTEE_CLIENT_VERSION := 4.7.0
-OPTEE_CLIENT_MD5 := bede2f80cf601ab46211da3396968862
+OPTEE_CLIENT_VERSION := 4.8.0
+OPTEE_CLIENT_MD5 := bde72d8c86946a7db8d4ee430c6b360a
OPTEE_CLIENT := optee-client-$(OPTEE_CLIENT_VERSION)
OPTEE_CLIENT_SUFFIX := tar.gz
OPTEE_CLIENT_URL :=
https://github.com/OP-TEE/optee_client/archive/$(OPTEE_CLIENT_VERSION).$(OPTEE_CLIENT_SUFFIX)
@@ -33,6 +33,8 @@ OPTEE_CLIENT_CONF_TOOL := cmake
OPTEE_CLIENT_CONF_OPT := \
$(CROSS_CMAKE_USR) \
-DBUILD_SHARED_LIBS=ON \
+ -DCFG_ENABLE_SYSTEMD=OFF \
+ -DCFG_ENABLE_UDEV=OFF \
-DCFG_FTRACE_SUPPORT=ON \
-DCFG_GP_SOCKETS=1 \
-DCFG_TA_GPROF_SUPPORT=ON \
@@ -47,6 +49,7 @@ OPTEE_CLIENT_CONF_OPT := \
-DCFG_TEE_SUPPL_USER=teesuppl \
-DCFG_TEE_SUPP_LOG_LEVEL=1 \
-DCFG_TEE_SUPP_PLUGINS=$(call ptx/onoff,
PTXCONF_OPTEE_CLIENT_SUPPLICANT_PLUGINS) \
+ -DCFG_USE_PKGCONFIG=OFF \
-DCFG_WERROR=ON \
-DRPMB_EMU=ON \
-DWITH_TEEACL=ON
diff --git a/rules/optee-examples.make b/rules/optee-examples.make
index ba586b6fe0a4..7b930dd834ea 100644
--- a/rules/optee-examples.make
+++ b/rules/optee-examples.make
@@ -16,8 +16,8 @@ endif
#
# Paths and names
#
-OPTEE_EXAMPLES_VERSION := 4.7.0
-OPTEE_EXAMPLES_MD5 := 43a72fe46d59d71fb8f3793e68f3a057
+OPTEE_EXAMPLES_VERSION := 4.8.0
+OPTEE_EXAMPLES_MD5 := f7e5b0c1293481383f6afb3b317413be
OPTEE_EXAMPLES := optee-examples-$(OPTEE_EXAMPLES_VERSION)
OPTEE_EXAMPLES_SUFFIX := tar.gz
OPTEE_EXAMPLES_URL :=
https://github.com/linaro-swg/optee_examples/archive/$(OPTEE_EXAMPLES_VERSION).$(OPTEE_EXAMPLES_SUFFIX)
@@ -32,7 +32,8 @@ OPTEE_EXAMPLES_LICENSE := BSD-2-Clause
OPTEE_EXAMPLES_CONF_TOOL := NO
OPTEE_EXAMPLES_MAKE_ENV := \
$(CROSS_ENV) \
- HOST_CROSS_COMPILE=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX)) \
+ HOST_CROSS_COMPILE=$(COMPILER_PREFIX) \
+ TA_CROSS_COMPILE=$(COMPILER_PREFIX) \
TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \
TEEC_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr
diff --git a/rules/optee-test.make b/rules/optee-test.make
index fb70f44cca96..8dd8e8b598c9 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -16,8 +16,8 @@ endif
#
# Paths and names
#
-OPTEE_TEST_VERSION := 4.7.0
-OPTEE_TEST_MD5 := 3a765b1feb11d02f345d0ba83759fa56
+OPTEE_TEST_VERSION := 4.8.0
+OPTEE_TEST_MD5 := 331d2a0019aae3bb31efecd9ad4e61f2
OPTEE_TEST := optee-test-$(OPTEE_TEST_VERSION)
OPTEE_TEST_SUFFIX := tar.gz
OPTEE_TEST_URL :=
https://github.com/OP-TEE/optee_test/archive/$(OPTEE_TEST_VERSION).$(OPTEE_TEST_SUFFIX)
diff --git a/rules/optee.make b/rules/optee.make
index b1be87c09c3f..f1ff83765d17 100644
--- a/rules/optee.make
+++ b/rules/optee.make
@@ -16,8 +16,8 @@ endif
#
# Paths and names
#
-OPTEE_VERSION := 4.7.0
-OPTEE_MD5 := 28e0d1349527223574bc243c926f586f
+OPTEE_VERSION := 4.8.0
+OPTEE_MD5 := ada772c4d9cb8ee977d1b6962f91e167
OPTEE := optee-$(OPTEE_VERSION)
OPTEE_SUFFIX := tar.gz
OPTEE_URL :=
https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX)
--
2.47.3
