From fff025c5434ebf010c95392ba0880aff407c958e Mon Sep 17 00:00:00 2001
From: Jun Zhu <junzhu@nxp.com>
Date: Sat, 14 Oct 2023 21:23:39 +0800
Subject: [PATCH] optee-test: Update optee-test_4.0.0.imx.bb to commit 90638d7

- Update the commit to top commit.
- Remove unnecessary patch.

Signed-off-by: Jun Zhu <junzhu@nxp.com>
---
 .../recipes-security/optee/optee-test-imx.inc |  1 -
 .../optee/optee-test/musl-workaround.patch    | 24 -------------------
 .../optee/optee-test_4.0.0.imx.bb             |  2 +-
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 meta-bsp/recipes-security/optee/optee-test/musl-workaround.patch

diff --git a/meta-bsp/recipes-security/optee/optee-test-imx.inc b/meta-bsp/recipes-security/optee/optee-test-imx.inc
index b14483caf9..8636f3374a 100644
--- a/meta-bsp/recipes-security/optee/optee-test-imx.inc
+++ b/meta-bsp/recipes-security/optee/optee-test-imx.inc
@@ -6,7 +6,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:"
 
 SRC_URI:remove = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
 SRC_URI:prepend = "${OPTEE_TEST_SRC};branch=${SRCBRANCH} "
-SRC_URI:append = "file://musl-workaround.patch"
 
 OPTEE_TEST_SRC ?= "git://github.com/nxp-imx/imx-optee-test.git;protocol=https"
 
diff --git a/meta-bsp/recipes-security/optee/optee-test/musl-workaround.patch b/meta-bsp/recipes-security/optee/optee-test/musl-workaround.patch
deleted file mode 100644
index eed1bd4be1..0000000000
--- a/meta-bsp/recipes-security/optee/optee-test/musl-workaround.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Hack to work around musl compile error:
- In file included from optee-test/3.17.0-r0/recipe-sysroot/usr/include/sys/stat.h:23,
-                  from optee-test/3.17.0-r0/git/host/xtest/regression_1000.c:25:
- optee-test/3.17.0-r0/recipe-sysroot/usr/include/bits/stat.h:17:26: error: expected identifier or '(' before '[' token
-    17 |         unsigned __unused[2];
-       |                          ^
-
-stat.h is not needed, since it is not being used in this file.  So removing it.
-
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Jon Mason <jon.mason@arm.com>
-
-diff --git a/host/xtest/regression_1000.c b/host/xtest/regression_1000.c
-index 4264884..7f1baca 100644
---- a/host/xtest/regression_1000.c
-+++ b/host/xtest/regression_1000.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/stat.h>
- #include <sys/types.h>
- #include <ta_arm_bti.h>
- #include <ta_concurrent.h>
diff --git a/meta-bsp/recipes-security/optee/optee-test_4.0.0.imx.bb b/meta-bsp/recipes-security/optee/optee-test_4.0.0.imx.bb
index 04ee7c3dbf..da4aca49c4 100644
--- a/meta-bsp/recipes-security/optee/optee-test_4.0.0.imx.bb
+++ b/meta-bsp/recipes-security/optee/optee-test_4.0.0.imx.bb
@@ -1,4 +1,4 @@
 require optee-test-imx.inc
 
 SRCBRANCH = "lf_4.0.y"
-SRCREV = "6bfc49fd6e537c00b5e6babf86d467b90b6ddd7c"
+SRCREV = "90638d70a01fea5b19b855823d612e8b4a289d21"