[Buildroot] [PATCH v4 1/7] boot/optee-os: correct TA files install

[Buildroot] [PATCH v4 1/7] boot/optee-os: correct TA files install

[Etienne Carriere]

This change corrects TA binary files install sequence that
were previously install in target filesystem though
OPTEE_OS_INSTALL_IMAGES_CMDS instead of expected
OPTEE_OS_INSTALL_TARGET_CMDS.

This change removes useless mkdir prior call to $(INSTALL)
that already handles parent directory creation when needed.

This change conditions .ta files install upon their
generation as a custom package repository may not generate
any .ta files.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
Changes v3 -> v4:
- No change
Changes v2 -> v3:
- No change
Changes v1 -> v2:
- Patch introduced in v2
---
 boot/optee-os/optee-os.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
index 6da20a9f3e..b22f560ba7 100644
--- a/boot/optee-os/optee-os.mk
+++ b/boot/optee-os/optee-os.mk
@@ -75,10 +75,10 @@ endef
 endif # BR2_TARGET_OPTEE_OS_CORE
 
 ifeq ($(BR2_TARGET_OPTEE_OS_SERVICES),y)
-define OPTEE_OS_INSTALL_IMAGES_SERVICES
-	mkdir -p $(TARGET_DIR)/lib/optee_armtz
-	$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
-		$(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta
+define OPTEE_OS_INSTALL_TARGET_CMDS
+	$(if $(wildcard $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta),
+		$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
+			$(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta)
 endef
 endif # BR2_TARGET_OPTEE_OS_SERVICES
 
-- 
2.17.1

[Buildroot] [PATCH v4 2/7] boot/optee-os: install trusted shared libraries

[Etienne Carriere]

Install generated trusted shared libraries in the target file
system next to the trusted applications.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
Changes v3 -> v4:
- Fix trusted shared libraries install source path
Changes v2 -> v3:
- Install shared trusted libs from OPTEE_OS_LOCAL_SDK (build
  dir) instead of $(OPTEE_OS_SDK) (staging dir) that is
  populated only upon BR2_TARGET_OPTEE_OS_SDK=y.
Changes v1 -> v2:
- Fixes on .ta file install commands move to a specific patch
- Fix BR2_TARGET_OPTEE_OS_SERVICES 1-string description
- Replace conditional commands in .ta files install commands
  with Makefile script level conditionals
---
 boot/optee-os/Config.in   | 14 +++++++-------
 boot/optee-os/optee-os.mk |  3 +++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index a1f1b910ac..4cb05798e5 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -70,16 +70,16 @@ config BR2_TARGET_OPTEE_OS_SDK
 	  installed in the staging directory /lib/optee.
 
 config BR2_TARGET_OPTEE_OS_SERVICES
-	bool "Build service TAs"
+	bool "Build service TAs and libs"
 	default y
 	select BR2_TARGET_OPTEE_OS_CORE
 	help
-	  This option installs the service trusted applications built
-	  from OP-TEE OS source tree. These are installed in the target
-	  /lib/optee_armtz directory as other trusted applications.
-	  At runtime OP-TEE OS can load trusted applications from this
-	  non-secure filesystem/directory into the secure world for
-	  execution.
+	  This option installs the service trusted applications and
+	  trusted shared libraries built from OP-TEE OS source tree.
+	  These are installed in target /lib/optee_armtz directory
+	  as other trusted applications. At runtime OP-TEE OS can
+	  load these from this non-secure filesystem/directory into
+	  the secure world for execution.
 
 config BR2_TARGET_OPTEE_OS_PLATFORM
 	string "Target platform (mandatory)"
diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
index b22f560ba7..bd415512c7 100644
--- a/boot/optee-os/optee-os.mk
+++ b/boot/optee-os/optee-os.mk
@@ -79,6 +79,9 @@ define OPTEE_OS_INSTALL_TARGET_CMDS
 	$(if $(wildcard $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta),
 		$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
 			$(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta)
+	$(if $(wildcard $(@D)/$(OPTEE_OS_LOCAL_SDK)/lib/*.ta),
+		$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \
+			$(@D)/$(OPTEE_OS_LOCAL_SDK)/lib/*.ta)
 endef
 endif # BR2_TARGET_OPTEE_OS_SERVICES
 
-- 
2.17.1

[Buildroot] [PATCH v4 2/7] boot/optee-os: install trusted shared libraries

[Thomas Petazzoni]

On Tue, 14 May 2019 10:53:14 +0200
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> Install generated trusted shared libraries in the target file
> system next to the trusted applications.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
> Changes v3 -> v4:
> - Fix trusted shared libraries install source path
> Changes v2 -> v3:
> - Install shared trusted libs from OPTEE_OS_LOCAL_SDK (build
>   dir) instead of $(OPTEE_OS_SDK) (staging dir) that is
>   populated only upon BR2_TARGET_OPTEE_OS_SDK=y.
> Changes v1 -> v2:
> - Fixes on .ta file install commands move to a specific patch
> - Fix BR2_TARGET_OPTEE_OS_SERVICES 1-string description
> - Replace conditional commands in .ta files install commands
>   with Makefile script level conditionals
> ---
>  boot/optee-os/Config.in   | 14 +++++++-------
>  boot/optee-os/optee-os.mk |  3 +++
>  2 files changed, 10 insertions(+), 7 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v4 3/7] boot/optee-os: bump version to 3.5.0

[Etienne Carriere]

Bump OP-TEE OS package version to OP-TEE release 3.5.0.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
Changes v3 -> v4:
- No change
Changes v2 -> v3:
- Fix commit message (s/dump/bump/g)
Changes v1 -> v2:
- Move hash file to package root dir
- Remove old 3.4.0/ subdir
---
 boot/optee-os/3.4.0/optee-os.hash | 4 ----
 boot/optee-os/Config.in           | 4 ++--
 boot/optee-os/optee-os.hash       | 4 ++++
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 boot/optee-os/3.4.0/optee-os.hash
 create mode 100644 boot/optee-os/optee-os.hash

diff --git a/boot/optee-os/3.4.0/optee-os.hash b/boot/optee-os/3.4.0/optee-os.hash
deleted file mode 100644
index 07afdfac8f..0000000000
--- a/boot/optee-os/3.4.0/optee-os.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# From https://github.com/OP-TEE/optee_os/archive/3.4.0.tar.gz
-sha256 51d42ac7aa780ec8d8ee471eff689a29a7621aacace046722b1490b62ec2d481  optee-os-3.4.0.tar.gz
-# Locally computed
-sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE
diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 4cb05798e5..bd685b58bf 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -18,7 +18,7 @@ choice
 	  Select the version of OP-TEE OS you want to use
 
 config BR2_TARGET_OPTEE_OS_LATEST
-	bool "3.4.0"
+	bool "3.5.0"
 	help
 	  Use the latest release tag from the OP-TEE OS official Git
 	  repository.
@@ -50,7 +50,7 @@ endif
 
 config BR2_TARGET_OPTEE_OS_VERSION
 	string
-	default "3.4.0"		if BR2_TARGET_OPTEE_OS_LATEST
+	default "3.5.0"		if BR2_TARGET_OPTEE_OS_LATEST
 	default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_OPTEE_OS_CUSTOM_GIT
 
diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
new file mode 100644
index 0000000000..167f96475d
--- /dev/null
+++ b/boot/optee-os/optee-os.hash
@@ -0,0 +1,4 @@
+# From https://github.com/OP-TEE/optee_os/archive/3.5.0.tar.gz
+sha256 a02fe8e7fdee9653e9207059071735a839b1255fdaf311a2a6cfd185a4cee6a2  optee-os-3.5.0.tar.gz
+# Locally computed
+sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE
-- 
2.17.1

[Buildroot] [PATCH v4 3/7] boot/optee-os: bump version to 3.5.0

[Thomas Petazzoni]

Hello,

On Tue, 14 May 2019 10:53:15 +0200
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
> new file mode 100644
> index 0000000000..167f96475d
> --- /dev/null
> +++ b/boot/optee-os/optee-os.hash
> @@ -0,0 +1,4 @@
> +# From https://github.com/OP-TEE/optee_os/archive/3.5.0.tar.gz
> +sha256 a02fe8e7fdee9653e9207059071735a839b1255fdaf311a2a6cfd185a4cee6a2  optee-os-3.5.0.tar.gz
> +# Locally computed
> +sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE

This hash was wrong: you did not test it with "make legal-info".

I fixed it and applied to next. Thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v4 3/7] boot/optee-os: bump version to 3.5.0

[Etienne Carriere]

On Tue, 14 May 2019 at 18:19, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello,
>
> On Tue, 14 May 2019 10:53:15 +0200
> Etienne Carriere <etienne.carriere@linaro.org> wrote:
>
> > diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
> > new file mode 100644
> > index 0000000000..167f96475d
> > --- /dev/null
> > +++ b/boot/optee-os/optee-os.hash
> > @@ -0,0 +1,4 @@
> > +# From https://github.com/OP-TEE/optee_os/archive/3.5.0.tar.gz
> > +sha256 a02fe8e7fdee9653e9207059071735a839b1255fdaf311a2a6cfd185a4cee6a2  optee-os-3.5.0.tar.gz
> > +# Locally computed
> > +sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE
>
> This hash was wrong: you did not test it with "make legal-info".
>
> I fixed it and applied to next. Thanks.
>

Thanks, and sorry, no I've never run "make legal-info". I will, promise!
And thanks for the whole series.

regards,
etienne


> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

[Buildroot] [PATCH v4 4/7] package/optee-client: bump version to 3.5.0

[Etienne Carriere]

Bump OP-TEE Client package version to release 3.5.0.
This change discard now useless patches on OP-TEE Client
package.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
Changes v3 -> v4:
- No change
Changes v2 -> v3:
- Fix on commit message: s/OP-TEE OS/OP-TEE Client/.
Changes v1 -> v2:
- No change
---
 ...-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch |  52 -------
 .../0002-libteec-fix-build-warnings.patch     | 128 ------------------
 .../0003-libteec-fix-clang-build-errors.patch |  64 ---------
 package/optee-client/optee-client.hash        |   4 +-
 package/optee-client/optee-client.mk          |   2 +-
 5 files changed, 3 insertions(+), 247 deletions(-)
 delete mode 100644 package/optee-client/0001-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch
 delete mode 100644 package/optee-client/0002-libteec-fix-build-warnings.patch
 delete mode 100644 package/optee-client/0003-libteec-fix-clang-build-errors.patch

diff --git a/package/optee-client/0001-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch b/package/optee-client/0001-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch
deleted file mode 100644
index b62357f52b..0000000000
--- a/package/optee-client/0001-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e2d82d46b33b693305978dfe64d84148314aef46 Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Wed, 6 Mar 2019 11:46:07 +0100
-Subject: [PATCH] cmake: support BUILD_STATIC_LIBS/BUILD_SHARED_LIBS
-
-CMake variables BUILD_STATIC_LIBS and BUILD_SHARED_LIBS
-set constraints on libraries and executable linkage.
-
-With this change OP-TEE client CMake script builds and installs the
-embedded files with the expected linkage configuration.
-
-Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
-Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
----
- libteec/CMakeLists.txt        | 5 +++--
- tee-supplicant/CMakeLists.txt | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/libteec/CMakeLists.txt b/libteec/CMakeLists.txt
-index 3ec8f66..e3495fb 100644
---- a/libteec/CMakeLists.txt
-+++ b/libteec/CMakeLists.txt
-@@ -33,7 +33,7 @@ endif()
- ################################################################################
- # Built library
- ################################################################################
--add_library (teec SHARED ${SRC})
-+add_library (teec ${SRC})
- 
- set_target_properties (teec PROPERTIES
- 	VERSION ${PROJECT_VERSION}
-@@ -71,4 +71,5 @@ target_link_libraries (teec
- ################################################################################
- # FIXME: This should in someway harmonize with CFG_TEE_CLIENT_LOAD_PATH
- # FIXME: Should we change this to /usr/local/lib?
--install (TARGETS teec DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install (TARGETS teec LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+                      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-diff --git a/tee-supplicant/CMakeLists.txt b/tee-supplicant/CMakeLists.txt
-index d2d3afd..e663be9 100644
---- a/tee-supplicant/CMakeLists.txt
-+++ b/tee-supplicant/CMakeLists.txt
-@@ -85,4 +85,4 @@ target_link_libraries (${PROJECT_NAME}
- ################################################################################
- # Install targets
- ################################################################################
--install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_SBINDIR})
-+install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
--- 
-2.17.1
-
diff --git a/package/optee-client/0002-libteec-fix-build-warnings.patch b/package/optee-client/0002-libteec-fix-build-warnings.patch
deleted file mode 100644
index e76b718e57..0000000000
--- a/package/optee-client/0002-libteec-fix-build-warnings.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 076522d57a1de87008762ad5cf8bfb0f5e40bb6a Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Wed, 20 Mar 2019 10:01:23 +0100
-Subject: [PATCH] libteec: fix build warnings
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build warnings reported by the Buildroot team [1]:
-
-/home/thomas/projets/outputs/armv5-ctng-linux-gnueabi/build/optee-client-3.4.0/libteec/src/tee_client_api.c: In function 'TEEC_InitializeContext':
-/home/thomas/projets/outputs/armv5-ctng-linux-gnueabi/build/optee-client-3.4.0/libteec/src/tee_client_api.c:149:28: error: 'gen_caps' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-    ctx->reg_mem = gen_caps & TEE_GEN_CAP_REG_MEM;
-                            ^
-/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c: In function ?TEEC_OpenSession?:
-/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c:507:8: error: cast increases required alignment of target type [-Werror=cast-align]
-  arg = (struct tee_ioctl_open_session_arg *)buf;
-        ^
-/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c: In function ?TEEC_InvokeCommand?:
-/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c:581:8: error: cast increases required alignment of target type [-Werror=cast-align]
-  arg = (struct tee_ioctl_invoke_arg *)buf;
-        ^
-
-[1] http://lists.busybox.net/pipermail/buildroot/2019-February/243437.html
-
-Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
-Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey960 32, 64)
-Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
-Upstream: https://github.com/OP-TEE/optee_client/commit/9dbc61b3767ab1c3dfd0a19af02926b92ae09247
----
- libteec/src/tee_client_api.c | 34 +++++++++++++++++++++-------------
- 1 file changed, 21 insertions(+), 13 deletions(-)
-
-diff --git a/libteec/src/tee_client_api.c b/libteec/src/tee_client_api.c
-index 698092b..cf0b1f7 100644
---- a/libteec/src/tee_client_api.c
-+++ b/libteec/src/tee_client_api.c
-@@ -140,7 +140,7 @@ TEEC_Result TEEC_InitializeContext(const char *name, TEEC_Context *ctx)
- 		return TEEC_ERROR_BAD_PARAMETERS;
- 
- 	for (n = 0; n < TEEC_MAX_DEV_SEQ; n++) {
--		uint32_t gen_caps;
-+		uint32_t gen_caps = 0;
- 
- 		snprintf(devname, sizeof(devname), "/dev/tee%zu", n);
- 		fd = teec_open_dev(devname, name, &gen_caps);
-@@ -481,10 +481,12 @@ TEEC_Result TEEC_OpenSession(TEEC_Context *ctx, TEEC_Session *session,
- 			uint32_t connection_method, const void *connection_data,
- 			TEEC_Operation *operation, uint32_t *ret_origin)
- {
--	uint64_t buf[(sizeof(struct tee_ioctl_open_session_arg) +
--			TEEC_CONFIG_PAYLOAD_REF_COUNT *
--				sizeof(struct tee_ioctl_param)) /
--			sizeof(uint64_t)] = { 0 };
-+	size_t p_sz = TEEC_CONFIG_PAYLOAD_REF_COUNT *
-+		      sizeof(struct tee_ioctl_param);
-+	union {
-+		struct tee_ioctl_open_session_arg arg;
-+		uint8_t data[sizeof(struct tee_ioctl_open_session_arg) + p_sz];
-+	} buf;
- 	struct tee_ioctl_buf_data buf_data;
- 	struct tee_ioctl_open_session_arg *arg;
- 	struct tee_ioctl_param *params;
-@@ -493,6 +495,8 @@ TEEC_Result TEEC_OpenSession(TEEC_Context *ctx, TEEC_Session *session,
- 	TEEC_SharedMemory shm[TEEC_CONFIG_PAYLOAD_REF_COUNT];
- 	int rc;
- 
-+	memset(&buf, 0, sizeof(buf));
-+
- 	(void)&connection_data;
- 
- 	if (!ctx || !session) {
-@@ -501,10 +505,10 @@ TEEC_Result TEEC_OpenSession(TEEC_Context *ctx, TEEC_Session *session,
- 		goto out;
- 	}
- 
--	buf_data.buf_ptr = (uintptr_t)buf;
-+	buf_data.buf_ptr = (uintptr_t)&buf;
- 	buf_data.buf_len = sizeof(buf);
- 
--	arg = (struct tee_ioctl_open_session_arg *)buf;
-+	arg = &buf.arg;
- 	arg->num_params = TEEC_CONFIG_PAYLOAD_REF_COUNT;
- 	params = (struct tee_ioctl_param *)(arg + 1);
- 
-@@ -555,10 +559,12 @@ void TEEC_CloseSession(TEEC_Session *session)
- TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
- 			TEEC_Operation *operation, uint32_t *error_origin)
- {
--	uint64_t buf[(sizeof(struct tee_ioctl_invoke_arg) +
--			TEEC_CONFIG_PAYLOAD_REF_COUNT *
--				sizeof(struct tee_ioctl_param)) /
--			sizeof(uint64_t)] = { 0 };
-+	size_t p_sz = TEEC_CONFIG_PAYLOAD_REF_COUNT *
-+			sizeof(struct tee_ioctl_param);
-+	union {
-+		struct tee_ioctl_invoke_arg arg;
-+		uint8_t data[sizeof(struct tee_ioctl_invoke_arg) + p_sz];
-+	} buf;
- 	struct tee_ioctl_buf_data buf_data;
- 	struct tee_ioctl_invoke_arg *arg;
- 	struct tee_ioctl_param *params;
-@@ -567,6 +573,8 @@ TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
- 	TEEC_SharedMemory shm[TEEC_CONFIG_PAYLOAD_REF_COUNT];
- 	int rc;
- 
-+	memset(&buf, 0, sizeof(buf));
-+
- 	if (!session) {
- 		eorig = TEEC_ORIGIN_API;
- 		res = TEEC_ERROR_BAD_PARAMETERS;
-@@ -575,10 +583,10 @@ TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
- 
- 	bm_timestamp();
- 
--	buf_data.buf_ptr = (uintptr_t)buf;
-+	buf_data.buf_ptr = (uintptr_t)&buf;
- 	buf_data.buf_len = sizeof(buf);
- 
--	arg = (struct tee_ioctl_invoke_arg *)buf;
-+	arg = &buf.arg;
- 	arg->num_params = TEEC_CONFIG_PAYLOAD_REF_COUNT;
- 	params = (struct tee_ioctl_param *)(arg + 1);
- 
--- 
-2.17.1
-
diff --git a/package/optee-client/0003-libteec-fix-clang-build-errors.patch b/package/optee-client/0003-libteec-fix-clang-build-errors.patch
deleted file mode 100644
index 1c845a1e2c..0000000000
--- a/package/optee-client/0003-libteec-fix-clang-build-errors.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d6f79741803dd31b34960dbc59999eb2482df9c1 Mon Sep 17 00:00:00 2001
-From: Victor Chong <victor.chong@linaro.org>
-Date: Fri, 22 Mar 2019 06:37:13 +0000
-Subject: [PATCH] libteec: fix clang build errors
-
-external/optee_client/libteec/src/tee_client_api.c:488:11: error: fields must have a constant size: 'variable length array in structure' extension will never be supported
-                uint8_t data[sizeof(struct tee_ioctl_open_session_arg) + p_sz];
-                        ^
-external/optee_client/libteec/src/tee_client_api.c:566:11: error: fields must have a constant size: 'variable length array in structure' extension will never be supported
-                uint8_t data[sizeof(struct tee_ioctl_invoke_arg) + p_sz];
-                        ^
-
-Fixes: 9dbc61b3 ("libteec: fix build warnings")
-Fixes: https://github.com/OP-TEE/optee_client/issues/152
-
-Signed-off-by: Victor Chong <victor.chong@linaro.org>
-Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
-
-Upstream: https://github.com/OP-TEE/optee_client/commit/16c8f548786c70df04d3a1e61bf89abce9b92389
-[fix conflict]
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
----
- libteec/src/tee_client_api.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/libteec/src/tee_client_api.c b/libteec/src/tee_client_api.c
-index cf0b1f7..4d7b134 100644
---- a/libteec/src/tee_client_api.c
-+++ b/libteec/src/tee_client_api.c
-@@ -481,11 +481,12 @@ TEEC_Result TEEC_OpenSession(TEEC_Context *ctx, TEEC_Session *session,
- 			uint32_t connection_method, const void *connection_data,
- 			TEEC_Operation *operation, uint32_t *ret_origin)
- {
--	size_t p_sz = TEEC_CONFIG_PAYLOAD_REF_COUNT *
--		      sizeof(struct tee_ioctl_param);
-+	const size_t arg_size = sizeof(struct tee_ioctl_open_session_arg) +
-+				TEEC_CONFIG_PAYLOAD_REF_COUNT *
-+					sizeof(struct tee_ioctl_param);
- 	union {
- 		struct tee_ioctl_open_session_arg arg;
--		uint8_t data[sizeof(struct tee_ioctl_open_session_arg) + p_sz];
-+		uint8_t data[arg_size];
- 	} buf;
- 	struct tee_ioctl_buf_data buf_data;
- 	struct tee_ioctl_open_session_arg *arg;
-@@ -559,11 +560,12 @@ void TEEC_CloseSession(TEEC_Session *session)
- TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
- 			TEEC_Operation *operation, uint32_t *error_origin)
- {
--	size_t p_sz = TEEC_CONFIG_PAYLOAD_REF_COUNT *
--			sizeof(struct tee_ioctl_param);
-+	const size_t arg_size = sizeof(struct tee_ioctl_invoke_arg) +
-+				TEEC_CONFIG_PAYLOAD_REF_COUNT *
-+					sizeof(struct tee_ioctl_param);
- 	union {
- 		struct tee_ioctl_invoke_arg arg;
--		uint8_t data[sizeof(struct tee_ioctl_invoke_arg) + p_sz];
-+		uint8_t data[arg_size];
- 	} buf;
- 	struct tee_ioctl_buf_data buf_data;
- 	struct tee_ioctl_invoke_arg *arg;
--- 
-2.17.1
-
diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
index 0da25ced2d..010eb69275 100644
--- a/package/optee-client/optee-client.hash
+++ b/package/optee-client/optee-client.hash
@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_client/archive/3.4.0.tar.gz
-sha256 7c131a44f4d73acb8816fba88bcd7e6a18537f0a522ae426a20e2ca7dc46a6ec  optee-client-3.4.0.tar.gz
+# From https://github.com/OP-TEE/optee_client/archive/3.5.0.tar.gz
+sha256 b7f6f8ac57c0c9b0cc59c34a2622b9ff3ae85676d2da10176fb2eaaa10716083  optee-client-3.5.0.tar.gz
 # Locally computed
 sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE
diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk
index 0a9fafd0d3..cf52b8e87e 100644
--- a/package/optee-client/optee-client.mk
+++ b/package/optee-client/optee-client.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_CLIENT_VERSION = 3.4.0
+OPTEE_CLIENT_VERSION = 3.5.0
 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
 OPTEE_CLIENT_LICENSE = BSD-2-Clause
 OPTEE_CLIENT_LICENSE_FILES = LICENSE
-- 
2.17.1

[Buildroot] [PATCH v4 4/7] package/optee-client: bump version to 3.5.0

[Thomas Petazzoni]

On Tue, 14 May 2019 10:53:16 +0200
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> Bump OP-TEE Client package version to release 3.5.0.
> This change discard now useless patches on OP-TEE Client
> package.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
> Changes v3 -> v4:
> - No change
> Changes v2 -> v3:
> - Fix on commit message: s/OP-TEE OS/OP-TEE Client/.
> Changes v1 -> v2:
> - No change
> ---
>  ...-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch |  52 -------
>  .../0002-libteec-fix-build-warnings.patch     | 128 ------------------
>  .../0003-libteec-fix-clang-build-errors.patch |  64 ---------
>  package/optee-client/optee-client.hash        |   4 +-
>  package/optee-client/optee-client.mk          |   2 +-
>  5 files changed, 3 insertions(+), 247 deletions(-)
>  delete mode 100644 package/optee-client/0001-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch
>  delete mode 100644 package/optee-client/0002-libteec-fix-build-warnings.patch
>  delete mode 100644 package/optee-client/0003-libteec-fix-clang-build-errors.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v4 4/7] package/optee-client: bump version to 3.5.0

[Thomas Petazzoni]

Hello,

On Tue, 14 May 2019 18:19:32 +0200
Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:

> Applied to master, thanks.

Sorry: I've applied to next, not master.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v4 5/7] package/optee-test: bump version to 3.5.0

[Etienne Carriere]

Bump OP-TEE Test package version to release 3.5.0. This
change updates patches on OP-TEE Test package accordingly.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
Changes v3 -> v4:
- No change
Changes v2 -> v3:
- Fix on commit message: s/OP-TEE OS/OP-TEE Test/.
Changes v1 -> v2:
- No change
---
 ...n-4100-update-string-conversion-loop.patch | 72 -------------------
 ...prevent-unsafe-loop-optimizations-bu.patch | 63 ++++++++++++++++
 package/optee-test/optee-test.hash            |  4 +-
 package/optee-test/optee-test.mk              |  2 +-
 4 files changed, 66 insertions(+), 75 deletions(-)
 delete mode 100644 package/optee-test/0001-regression-4100-update-string-conversion-loop.patch
 create mode 100644 package/optee-test/0001-regression-41xx-prevent-unsafe-loop-optimizations-bu.patch

diff --git a/package/optee-test/0001-regression-4100-update-string-conversion-loop.patch b/package/optee-test/0001-regression-4100-update-string-conversion-loop.patch
deleted file mode 100644
index 62862867be..0000000000
--- a/package/optee-test/0001-regression-4100-update-string-conversion-loop.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 88714fc174b91950c9e1c53a9832fc6d4ffa6e2a Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Sun, 17 Feb 2019 22:44:44 +0100
-Subject: [PATCH] regression 4100: update string conversion loop
-
-Change the loop used to convert string into numerical value.
-The original loop was fine but its implementation hits toolchain
-unsafe-loop-optimizations feature. The new implementation
-proposed here simplifies a bit the loop and prevents toolchain
-from complaining when directive -Werror=unsafe-loop-optimizations
-is enabled.
-
-Issue reported by the Buildroot cross toolchain [1] with the
-following error traces:
-
-build/armv7/build/optee-test-3.4.0/host/xtest/regression_4100.c:447:8: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations]
-  while (spos) {
-        ^
-build/optee-test-3.4.0/host/xtest/regression_4100.c:454:6: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations]
-   if (!spos)
-      ^
-
-[1] arm-buildroot-linux-uclibcgnueabihf-gcc.br_real (Buildroot 2019.02-git-00933-gb75e93c) 7.4.0
-
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
----
- host/xtest/regression_4100.c | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/host/xtest/regression_4100.c b/host/xtest/regression_4100.c
-index b477f38..88346d4 100644
---- a/host/xtest/regression_4100.c
-+++ b/host/xtest/regression_4100.c
-@@ -445,21 +445,24 @@ static TEEC_Result convert_from_string(ADBG_Case_t *c, TEEC_Session *s,
- 		return TEEC_ERROR_OUT_OF_MEMORY;
- 
- 	while (spos) {
--		spos--;
--		nibble = digit_value(str[spos]);
--		if (nibble == -1)
-+		nibble = digit_value(str[spos - 1]);
-+		if (nibble == -1) {
-+			spos--;
- 			break;
-+		}
- 		os[ospos] = nibble;
- 
--		if (!spos)
--			break;
-+		if (spos > 1) {
-+			nibble = digit_value(str[spos - 2]);
-+			if (nibble == -1) {
-+				spos -= 2;
-+				break;
-+			}
-+			os[ospos] |= nibble << 4;
-+			ospos--;
-+			spos--;
-+		}
- 		spos--;
--		nibble = digit_value(str[spos]);
--		if (nibble == -1)
--			break;
--
--		os[ospos] |= nibble << 4;
--		ospos--;
- 	}
- 
- 	if (spos)
--- 
-2.20.1
-
diff --git a/package/optee-test/0001-regression-41xx-prevent-unsafe-loop-optimizations-bu.patch b/package/optee-test/0001-regression-41xx-prevent-unsafe-loop-optimizations-bu.patch
new file mode 100644
index 0000000000..8b6871f4e3
--- /dev/null
+++ b/package/optee-test/0001-regression-41xx-prevent-unsafe-loop-optimizations-bu.patch
@@ -0,0 +1,63 @@
+From 5a83a50c47c46c54a443aa18ed6456416fa27a98 Mon Sep 17 00:00:00 2001
+From: Etienne Carriere <etienne.carriere@linaro.org>
+Date: Thu, 25 Apr 2019 10:19:05 +0200
+Subject: [PATCH] regression 41xx: prevent unsafe-loop-optimizations build
+ error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add -Wno-unsafe-loop-optimizations directive since regression_4100.c
+fails to build on some recent toolchains as GCC 7.3.0 and 7.4.0 with
+an error trace like below. Note building with GCC 8.2.1 does not
+reproduce the build issue.
+
+/path/to/optee_test/host/xtest/regression_4100.c: In function ?convert_from_string?:
+/path/to/optee_test/host/xtest/regression_4100.c:448:8: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations]
+  while (spos) {
+        ^
+/path/to/optee_test/host/xtest/regression_4100.c:455:6: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations]
+   if (!spos)
+      ^
+
+The GNU Makefile build sequence defines -Wno-unsafe-loop-optimizations
+for the whole xtest sources while CMake build sequence defines it
+specifically for regression_4100.c among xtest source files.
+
+Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
+Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
+---
+ host/xtest/CMakeLists.txt | 4 ++++
+ host/xtest/Makefile       | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git a/host/xtest/CMakeLists.txt b/host/xtest/CMakeLists.txt
+index 1f3a6f4..3868bcd 100644
+--- a/host/xtest/CMakeLists.txt
++++ b/host/xtest/CMakeLists.txt
+@@ -61,6 +61,10 @@ set (SRC
+ 	xtest_test.c
+ )
+ 
++set_source_files_properties(
++	regression_4100.c PROPERTIES COMPILE_FLAGS -Wno-unsafe-loop-optimizations
++)
++
+ if (CFG_GP_SOCKETS)
+ 	list (APPEND SRC
+ 		regression_2000.c
+diff --git a/host/xtest/Makefile b/host/xtest/Makefile
+index f226500..e930d9c 100644
+--- a/host/xtest/Makefile
++++ b/host/xtest/Makefile
+@@ -155,6 +155,7 @@ CFLAGS += -Wall -Wcast-align -Werror \
+ 	  -Wshadow -Wstrict-prototypes -Wswitch-default \
+ 	  -Wwrite-strings \
+ 	  -Wno-declaration-after-statement \
++	  -Wno-unsafe-loop-optimizations \
+ 	  -Wno-missing-field-initializers -Wno-format-zero-length
+ endif
+ 
+-- 
+2.17.1
+
diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash
index c8ae51b8ee..a99cf0bd40 100644
--- a/package/optee-test/optee-test.hash
+++ b/package/optee-test/optee-test.hash
@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_test/archive/3.4.0.tar.gz
-sha256 755904c5b845763a2460c32c21100a57c713009b6b88cc3fc21f0e5be8645e2b  optee-test-3.4.0.tar.gz
+# From https://github.com/OP-TEE/optee_test/archive/3.5.0.tar.gz
+sha256 19118b7002a618bb2519cf7d0d61feb90e8574148f69b29260344119ac855520  optee-test-3.5.0.tar.gz
 # Locally computed
 sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7  LICENSE.md
diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
index abed09d5e3..935cdfa860 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_TEST_VERSION = 3.4.0
+OPTEE_TEST_VERSION = 3.5.0
 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION))
 OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause,
 OPTEE_TEST_LICENSE_FILES = LICENSE.md
-- 
2.17.1

[Buildroot] [PATCH v4 5/7] package/optee-test: bump version to 3.5.0

[Thomas Petazzoni]

On Tue, 14 May 2019 10:53:17 +0200
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> Bump OP-TEE Test package version to release 3.5.0. This
> change updates patches on OP-TEE Test package accordingly.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
> Changes v3 -> v4:
> - No change
> Changes v2 -> v3:
> - Fix on commit message: s/OP-TEE OS/OP-TEE Test/.
> Changes v1 -> v2:
> - No change
> ---
>  ...n-4100-update-string-conversion-loop.patch | 72 -------------------
>  ...prevent-unsafe-loop-optimizations-bu.patch | 63 ++++++++++++++++
>  package/optee-test/optee-test.hash            |  4 +-
>  package/optee-test/optee-test.mk              |  2 +-
>  4 files changed, 66 insertions(+), 75 deletions(-)
>  delete mode 100644 package/optee-test/0001-regression-4100-update-string-conversion-loop.patch
>  create mode 100644 package/optee-test/0001-regression-41xx-prevent-unsafe-loop-optimizations-bu.patch

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v4 6/7] package/optee-examples: bump version to 3.5.0

[Etienne Carriere]

Bump OP-TEE Examples package version to release 3.5.0.
This change discard now useless patches on OP-TEE Examples
package.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
Changes v3 -> v4:
- No change
Changes v2 -> v3:
- Fix on commit message: s/OP-TEE OS/OP-TEE Examples/.
Changes v1 -> v2:
- No change
---
 ...-fix-deprecated-size_t-type-for-size.patch | 42 -------------------
 package/optee-examples/optee-examples.hash    |  4 +-
 package/optee-examples/optee-examples.mk      |  2 +-
 3 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch

diff --git a/package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch b/package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch
deleted file mode 100644
index 4f1fb38305..0000000000
--- a/package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1a2713ac698410fb1a889941d52df12a7bd75f3b Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Sun, 17 Feb 2019 22:17:21 +0100
-Subject: [PATCH] secure_storage: fix deprecated size_t type for size
-
-size_t types is an deprecated type used in GPD API v1.0.
-Update
-
-Error reported by GCC 7.3-2018.05:
-  secure_storage_ta.c:203:6: warning: passing argument 4 of 'TEE_ReadObjectData' from incompatible pointer type [-Wincompatible-pointer-types]
-      &read_bytes);
-
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
----
- secure_storage/ta/secure_storage_ta.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/secure_storage/ta/secure_storage_ta.c b/secure_storage/ta/secure_storage_ta.c
-index d120e47..3ccc12d 100644
---- a/secure_storage/ta/secure_storage_ta.c
-+++ b/secure_storage/ta/secure_storage_ta.c
-@@ -146,7 +146,7 @@ static TEE_Result read_raw_object(uint32_t param_types, TEE_Param params[4])
- 	TEE_ObjectHandle object;
- 	TEE_ObjectInfo object_info;
- 	TEE_Result res;
--	size_t read_bytes;
-+	uint32_t read_bytes;
- 	char *obj_id;
- 	size_t obj_id_sz;
- 	char *data;
-@@ -202,7 +202,7 @@ static TEE_Result read_raw_object(uint32_t param_types, TEE_Param params[4])
- 	res = TEE_ReadObjectData(object, data, object_info.dataSize,
- 				 &read_bytes);
- 	if (res != TEE_SUCCESS || read_bytes != object_info.dataSize) {
--		EMSG("TEE_ReadObjectData failed 0x%08x, read %u over %u",
-+		EMSG("TEE_ReadObjectData failed 0x%08x, read %" PRIu32 " over %u",
- 				res, read_bytes, object_info.dataSize);
- 		goto exit;
- 	}
--- 
-2.20.1
-
diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash
index 077fd9757c..980595eb69 100644
--- a/package/optee-examples/optee-examples.hash
+++ b/package/optee-examples/optee-examples.hash
@@ -1,4 +1,4 @@
-# From https://github.com/linaro-swg/optee_examples/archive/3.4.0.tar.gz
-sha256 d833753980ac438c1675787857bb8352997352212334274de9419770097ce039  optee-examples-3.4.0.tar.gz
+# From https://github.com/linaro-swg/optee_examples/archive/3.5.0.tar.gz
+sha256 5b7cf07f6d4b19a8557cfa9ab7a0d98b9e199832694c65c8a74e928926821862  optee-examples-3.5.0.tar.gz
 # Locally computed
 sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9  LICENSE
diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk
index f2163b8643..7d08209ce8 100644
--- a/package/optee-examples/optee-examples.mk
+++ b/package/optee-examples/optee-examples.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_EXAMPLES_VERSION = 3.4.0
+OPTEE_EXAMPLES_VERSION = 3.5.0
 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION))
 OPTEE_EXAMPLES_LICENSE = BSD-2-Clause
 OPTEE_EXAMPLES_LICENSE_FILES = LICENSE
-- 
2.17.1

[Buildroot] [PATCH v4 6/7] package/optee-examples: bump version to 3.5.0

[Thomas Petazzoni]

On Tue, 14 May 2019 10:53:18 +0200
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> Bump OP-TEE Examples package version to release 3.5.0.
> This change discard now useless patches on OP-TEE Examples
> package.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
> Changes v3 -> v4:
> - No change
> Changes v2 -> v3:
> - Fix on commit message: s/OP-TEE OS/OP-TEE Examples/.
> Changes v1 -> v2:
> - No change
> ---
>  ...-fix-deprecated-size_t-type-for-size.patch | 42 -------------------
>  package/optee-examples/optee-examples.hash    |  4 +-
>  package/optee-examples/optee-examples.mk      |  2 +-
>  3 files changed, 3 insertions(+), 45 deletions(-)
>  delete mode 100644 package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v4 7/7] package/optee-benchmark: bump version to 3.5.0

[Etienne Carriere]

Bump OP-TEE Benchmark package version to release 3.5.0
which now provides an identified LICENSE file.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
Changes v3 -> v4:
- No change
Changes v2 -> v3:
- Fix on commit message: s/OP-TEE OS/OP-TEE Benchmark/.
Changes v1 -> v2:
- No change
---
 package/optee-benchmark/optee-benchmark.hash | 6 ++++--
 package/optee-benchmark/optee-benchmark.mk   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
index c3c41b69da..a19427ea13 100644
--- a/package/optee-benchmark/optee-benchmark.hash
+++ b/package/optee-benchmark/optee-benchmark.hash
@@ -1,2 +1,4 @@
-# From https://github.com/linaro-swg/optee_benchmark/archive/3.4.0.tar.gz
-sha256 e5e868a06a9dcc8cc444b3e72c65f57670b0811091be62edbe0d03d13c75e716 optee-benchmark-3.4.0.tar.gz
+# From https://github.com/linaro-swg/optee_benchmark/archive/3.5.0.tar.gz
+sha256 678fd4d3f65d7e18952f4505a1caad6c7ebfef67458a2e92fb51f8c098e7f439 optee-benchmark-3.5.0.tar.gz
+# Locally computed
+sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE
diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk
index 4ebab4498e..54f1359444 100644
--- a/package/optee-benchmark/optee-benchmark.mk
+++ b/package/optee-benchmark/optee-benchmark.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_BENCHMARK_VERSION = 3.4.0
+OPTEE_BENCHMARK_VERSION = 3.5.0
 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION))
 OPTEE_BENCHMARK_LICENSE = BSD-2-Clause
 
-- 
2.17.1

[Buildroot] [PATCH v4 7/7] package/optee-benchmark: bump version to 3.5.0

[Thomas Petazzoni]

Hello,

On Tue, 14 May 2019 10:53:19 +0200
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> Bump OP-TEE Benchmark package version to release 3.5.0
> which now provides an identified LICENSE file.

But you did not add it to LICENSE_FILES, and the hash you added in
the .hash file for the LICENSE file was wrong. You really did not test
"make legal-info" it seems :-)

I fixed this and applied to next. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v4 1/7] boot/optee-os: correct TA files install

[Thomas Petazzoni]

On Tue, 14 May 2019 10:53:13 +0200
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> This change corrects TA binary files install sequence that
> were previously install in target filesystem though
> OPTEE_OS_INSTALL_IMAGES_CMDS instead of expected
> OPTEE_OS_INSTALL_TARGET_CMDS.
> 
> This change removes useless mkdir prior call to $(INSTALL)
> that already handles parent directory creation when needed.
> 
> This change conditions .ta files install upon their
> generation as a custom package repository may not generate
> any .ta files.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
> Changes v3 -> v4:
> - No change
> Changes v2 -> v3:
> - No change
> Changes v1 -> v2:
> - Patch introduced in v2
> ---
>  boot/optee-os/optee-os.mk | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com