On Thu, Dec 17, 2020 at 09:30:26AM +0100, Robin van der Gracht wrote:
> Enabled by default for backwards compatibility.
> The added patch was pulled from the optee-client git repository. It will
> be included in the next optee-client release.
Rouven, can you take a look at this?
> Signed-off-by: Robin van der Gracht
> ---
>
> v2: Added the missing optee-client.in changes.
>
> ...ake-RPMB_EMU-a-conditional-assignmen.patch | 36 +++
> rules/optee-client.in | 5 +++
> rules/optee-client.make | 1 +
> 3 files changed, 42 insertions(+)
> create mode 100644
> patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch
>
> diff --git
> a/patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch
>
> b/patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch
> new file mode 100644
> index 0..cf1a12703
> --- /dev/null
> +++
> b/patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch
> @@ -0,0 +1,36 @@
> +From a0d685745ae00bfc275c27a07565f490de48b5e2 Mon Sep 17 00:00:00 2001
> +From: Ilias Apalodimas
> +Date: Mon, 19 Oct 2020 14:29:24 +0300
> +Subject: [PATCH] tee-supplicant: make RPMB_EMU a conditional assignment
> +
> +At the moment the RPMB_EMU variable in the Makefile uses a simple
> +assignment and unconditionally sets the variable.
> +Move it to a conditional assignment and allow users to override it
> +from the command line with:
> +CROSS_COMPILE=aarch64-linux-gnu- RPMB_EMU=0 make
> +
> +Signed-off-by: Ilias Apalodimas
> +Reviewed-by: Jerome Forissier
> +Reviewed-by: Jens Wiklander
> +---
> + tee-supplicant/Makefile | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile
> +index b7cf39a..fa26154 100644
> +--- a/tee-supplicant/Makefile
> b/tee-supplicant/Makefile
> +@@ -3,8 +3,8 @@ include ../config.mk
> +
> + OUT_DIR := $(OO)/tee-supplicant
> +
> +-# Emulate RPMB ioctl's
> +-RPMB_EMU:= 1
> ++# Emulate RPMB ioctl's by default
> ++RPMB_EMU?= 1
> +
> + .PHONY: all tee-supplicant clean
> +
> +--
> +2.25.1
> +
> diff --git a/rules/optee-client.in b/rules/optee-client.in
> index be97b3689..dbde5656d 100644
> --- a/rules/optee-client.in
> +++ b/rules/optee-client.in
> @@ -20,4 +20,9 @@ config OPTEE_CLIENT_SYSTEMD_UNIT
> depends on SYSTEMD
> prompt "install systemd service file for tee-supplicant"
>
> +config OPTEE_CLIENT_RPMB_EMU
> +bool
> +default y
> +prompt "Emulate RPMB device for testing"
So this is just something for testing, right? I think we can disable this
by default.
Rouven, what do you think?
Michael
> +
> endif
> diff --git a/rules/optee-client.make b/rules/optee-client.make
> index dc76773c7..85ea30cc9 100644
> --- a/rules/optee-client.make
> +++ b/rules/optee-client.make
> @@ -32,6 +32,7 @@ OPTEE_CLIENT_MAKE_ENV := \
> $(CROSS_ENV) \
> LIBDIR=/usr/lib \
> INCLUDEDIR=/usr/include \
> + RPMB_EMU=$(call ptx/ifdef, PTXCONF_OPTEE_CLIENT_RPMB_EMU, 1, 0) \
> CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/
>
> #
>
> --
> 2.25.1
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to
> ptxdist-requ...@pengutronix.de
>
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
