rcar-gen3: IPL: Upgrade IPL version according to BSP v3.7.0

This commit changes the following contents:
- Upgrade IPL and Secure Monitor Rev1.0.21 rev2.
- Upgrade optee_os Rev1.0.14 rev2.

Signed-off-by: Khang Nguyen <khang.nguyen.xv@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>

3 files changed, 6 insertions, 46 deletions

diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Add-LDFLAGS-option.patch b/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Add-LDFLAGS-option.patch
deleted file mode 100644
index 94d25ff..0000000
--- a/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Add-LDFLAGS-option.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2035e9a30a235204b3d96ec369ad601dfd93579d Mon Sep 17 00:00:00 2001
-From: Jun Miyauchi <jun.miyauchi.sr@hitachi.com>
-Date: Fri, 22 Dec 2017 09:13:57 +0900
-Subject: [PATCH] Add LDFLAGS option
-
----
- libteec/Makefile        | 2 +-
- tee-supplicant/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libteec/Makefile b/libteec/Makefile
-index 568a2cd..a9cca19 100644
---- a/libteec/Makefile
-+++ b/libteec/Makefile
-@@ -45,7 +45,7 @@ libteec: $(TEEC_LIBRARY)
- 
- $(TEEC_LIBRARY): $(TEEC_OBJS)
- 	@echo "  LINK    $@"
--	$(VPREFIX)$(CC) -shared -Wl,-soname,$(LIB_MAJ_MIN) $(TEEC_LFLAGS) -o $@ $+
-+	$(VPREFIX)$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_MAJ_MIN) $(TEEC_LFLAGS) -o $@ $+
- 	@echo ""
- 
- $(TEEC_OBJ_DIR)/%.o: ${TEEC_SRC_DIR}/%.c
-diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile
-index 737d39a..98e7408 100644
---- a/tee-supplicant/Makefile
-+++ b/tee-supplicant/Makefile
-@@ -69,7 +69,7 @@ tee-supplicant: $(TEES_FILE)
- 
- $(TEES_FILE): $(TEES_OBJS)
- 	@echo "  LINK    $@"
--	$(VPREFIX)$(CC) -o $@ $+ $(TEES_LDFLAGS)
-+	$(VPREFIX)$(CC) $(LDFLAGS) -o $@ $+ $(TEES_LDFLAGS)
- 	@echo ""
- 
- $(TEES_OBJ_DIR)/%.o: $(TEES_SRC_DIR)/%.c
--- 
-2.14.1.windows.1
-
diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb b/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb
index 4075532..c22775b 100644
--- a/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb
+++ b/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb
@@ -3,13 +3,12 @@ LICENSE = "BSD-2-Clause"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 PR = "r0"
-PV = "2.6.0+renesas+git${SRCPV}"
+PV = "3.1.0+renesas+git${SRCPV}"
 BRANCH = "master"
 SRC_URI = "git://github.com/OP-TEE/optee_client.git;branch=${BRANCH}"
-SRCREV = "73b4e490a8ed0b4a7714818e80998b9d8a7da958"
+SRCREV = "3f16662284a69fdec97b1712064be94d1fed7ae7"
 
 SRC_URI += " \
-    file://0001-Add-LDFLAGS-option.patch \
     file://optee.service \
 "
 
diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb b/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb
index 604ad9a..30f430e 100644
--- a/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb
+++ b/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb
@@ -10,11 +10,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit deploy pythonnative
 
-PV = "2.6.0+renesas+git${SRCPV}"
+PV = "3.1.0+renesas+git${SRCPV}"
 
 BRANCH = "rcar_gen3"
-SRCREV_renesas = "894c561158d7f63e4211cdad46ff69cf220bc972"
-SRCREV_officialgit = "6d57389f9eec0c213da917e35861a8eca4b205b3"
+SRCREV_renesas = "5524832ca895973a372223a6bff9cc3fc7df4b15"
+SRCREV_officialgit = "0ab9388c0d553a6bb5ae04e41b38ba40cf0474bf"
 SRCREV_FORMAT = "renesas_officialgit"
 
 SRC_URI = " \
@@ -43,7 +43,7 @@ S = "${WORKDIR}/git"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 do_configure() {
-    cp -r ${WORKDIR}/git_official/core/lib/libtomcrypt ${B}/core/lib/.
+    cp -rn ${WORKDIR}/git_official/core/lib/libtomcrypt ${B}/core/lib/.
 }
 
 do_compile() {