diff --git a/meta-rcar-gateway/recipes-bsp/optee/optee-os/0001-mk-gcc.mk-Change-the-path-to-the-library.patch b/meta-rcar-gateway/recipes-bsp/optee/optee-os/0001-mk-gcc.mk-Change-the-path-to-the-library.patch
index 29f1d4a7d..fbece69f6 100644
--- a/meta-rcar-gateway/recipes-bsp/optee/optee-os/0001-mk-gcc.mk-Change-the-path-to-the-library.patch
+++ b/meta-rcar-gateway/recipes-bsp/optee/optee-os/0001-mk-gcc.mk-Change-the-path-to-the-library.patch
@@ -16,15 +16,17 @@ diff --git a/mk/gcc.mk b/mk/gcc.mk
 index adc77a24f..e871699e2 100644
 --- a/mk/gcc.mk
 +++ b/mk/gcc.mk
-@@ -1,8 +1,12 @@
+@@ -1,8 +1,14 @@
  
 -CC$(sm)		:= $(CROSS_COMPILE_$(sm))gcc
 -CXX$(sm)	:= $(CROSS_COMPILE_$(sm))g++
 +ifdef PKG_CONFIG_SYSROOT_DIR
 +CC$(sm)        := $(CROSS_COMPILE_$(sm))gcc --sysroot=$(PKG_CONFIG_SYSROOT_DIR)
++CXX$(sm)       := $(CROSS_COMPILE_$(sm))g++ --sysroot=$(PKG_CONFIG_SYSROOT_DIR)
 +LD$(sm)        := $(CROSS_COMPILE_$(sm))ld.bfd --sysroot=$(PKG_CONFIG_SYSROOT_DIR)
 +else
 +CC$(sm)        := $(CROSS_COMPILE_$(sm))gcc
++CXX$(sm)       := $(CROSS_COMPILE_$(sm))g++
 +LD$(sm)        := $(CROSS_COMPILE_$(sm))ld.bfd
 +endif
  CPP$(sm)	:= $(CROSS_COMPILE_$(sm))cpp
diff --git a/meta-rcar-gateway/recipes-bsp/optee/optee-os_git.bb b/meta-rcar-gateway/recipes-bsp/optee/optee-os_git.bb
index b071ac719..fea82b4e6 100644
--- a/meta-rcar-gateway/recipes-bsp/optee/optee-os_git.bb
+++ b/meta-rcar-gateway/recipes-bsp/optee/optee-os_git.bb
@@ -41,8 +41,14 @@ do_compile() {
     oe_runmake PLATFORM=${PLATFORM} CFG_ARM64_core=y CFG_ARM_GICV3=y
 }
 
-# do_install() nothing
-do_install[noexec] = "1"
+do_install () {
+    #install TA devkit
+    install -d ${D}/usr/include/optee/export-user_ta/
+
+    for f in  ${B}/out/arm-plat-${PLATFORM}/export-ta_arm64/* ; do
+        cp -aR  $f  ${D}/usr/include/optee/export-user_ta/
+    done
+}
 
 do_deploy() {
     # Create deploy folder
@@ -56,3 +62,5 @@ do_deploy() {
 
 addtask deploy before do_build after do_compile
 
+INSANE_SKIP_${PN}-dev = "staticdev"
+INHIBIT_PACKAGE_STRIP = "1"