[ptxdist] [PATCH 1/3] optee-test: drop OPTEE_OPENSSL_EXPORT

[ptxdist] [PATCH 1/3] optee-test: drop OPTEE_OPENSSL_EXPORT

[Michael Tretter]

The option has been removed in Commit f4dd113528cf ("Remove embedded
OpenSSL"). The Makefile now uses either -lcrypto or
$(OPENSSL_INSTALL_PATH).

Remove the obsolete option.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-test.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/optee-test.make b/rules/optee-test.make
index 6f0951ddb93f..69937442a613 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -39,7 +39,7 @@ OPTEE_TEST_MAKE_ENV	:= \
 	CROSS_COMPILE_TA=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX)) \
 	TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \
 	OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr \
-	COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib \
+	COMPILE_NS_USER=32 \
 	CFG_TEE_PLUGIN_LOAD_PATH=/usr/lib/tee-supplicant/plugins \
 	bindir=/usr/bin \
 	libdir=/usr/lib
-- 
2.47.3

[ptxdist] [PATCH 2/3] optee-test: drop COMPILE_NS_USER

[Michael Tretter]

The COMPILE_NS_USER option was used to specify the arch to link against
the correct version of libcrypto. This is now detected automatically.

Drop the obsolete COMPILE_NS_USER option.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-test.make | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rules/optee-test.make b/rules/optee-test.make
index 69937442a613..038b3461b342 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -39,7 +39,6 @@ OPTEE_TEST_MAKE_ENV	:= \
 	CROSS_COMPILE_TA=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX)) \
 	TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \
 	OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr \
-	COMPILE_NS_USER=32 \
 	CFG_TEE_PLUGIN_LOAD_PATH=/usr/lib/tee-supplicant/plugins \
 	bindir=/usr/bin \
 	libdir=/usr/lib
-- 
2.47.3

[ptxdist] [PATCH 3/3] optee-test: pass OPTEE_CFG to Makefile

[Michael Tretter]

The optee-tests re-use some of the configure option for OP-TEE to enable
test suites. For example, the pkcs11 test suite is enabled and build, if
the PKCS#11 TA is enabled for OP-TEE.

Allow setting these CFG_* options and by default pass the same options
as passed to OP-TEE itself.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-test.in   | 17 ++++++++++++++++-
 rules/optee-test.make |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/rules/optee-test.in b/rules/optee-test.in
index 47859a299520..fdc68866b5a7 100644
--- a/rules/optee-test.in
+++ b/rules/optee-test.in
@@ -1,6 +1,6 @@
 ## SECTION=security
 
-config OPTEE_TEST
+menuconfig OPTEE_TEST
 	tristate
 	select OPTEE_CLIENT
 	select OPTEE_CLIENT_SUPPLICANT_PLUGINS
@@ -11,3 +11,18 @@ config OPTEE_TEST
 	  The optee_test git contains the source code for the TEE sanity
 	  testsuite in Linux using the ARM(R) TrustZone(R) technology. It is
 	  distributed under the GPLv2 and BSD 2-clause open-source licenses.
+
+if OPTEE_TEST
+
+config OPTEE_TEST_CFG
+	string
+	prompt "OP-TEE CFG Flags"
+	default "${PTXCONF_OPTEE_CFG}"
+	help
+	  The optee-tests use some of the OP-TEE CFG flags for its own
+	  configuration and enabling test suites. Allow the user to pass
+	  additional options to configure the optee-tests.
+
+	  By default, pass the same options as passeed to OP-TEE.
+
+endif
diff --git a/rules/optee-test.make b/rules/optee-test.make
index 038b3461b342..fb70f44cca96 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -40,6 +40,7 @@ OPTEE_TEST_MAKE_ENV	:= \
 	TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \
 	OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr \
 	CFG_TEE_PLUGIN_LOAD_PATH=/usr/lib/tee-supplicant/plugins \
+	$(call remove_quotes,$(PTXCONF_OPTEE_TEST_CFG)) \
 	bindir=/usr/bin \
 	libdir=/usr/lib
 
-- 
2.47.3