OP-TEE 3.6.0 stable

Change-Id: Ibb8fc894692324febd2eb40c5e753ab2f99b9239 Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
OP-TEE · Jul 5, 2019 · f181e95 · f181e95
1 parent 4b852b1
commit f181e95
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 82 deletions.
diff --git a/am43xx.xml b/am43xx.xml
@@ -6,15 +6,15 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"   name="OP-TEE/optee_client.git" />
-        <project path="optee_os"       name="OP-TEE/optee_os.git" />
-        <project path="optee_test"     name="OP-TEE/optee_test.git" />
-        <project path="build"          name="OP-TEE/build.git">
+        <project path="optee_client"   name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="am43xx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples" name="linaro-swg/optee_examples.git"       revision="master" />
+        <project path="optee_examples" name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />

diff --git a/am57xx.xml b/am57xx.xml
@@ -6,15 +6,15 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"   name="OP-TEE/optee_client.git" />
-        <project path="optee_os"       name="OP-TEE/optee_os.git" />
-        <project path="optee_test"     name="OP-TEE/optee_test.git" />
-        <project path="build"          name="OP-TEE/build.git">
+        <project path="optee_client"   name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="am57xx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples" name="linaro-swg/optee_examples.git"       revision="master" />
+        <project path="optee_examples" name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />

diff --git a/default.xml b/default.xml
@@ -5,18 +5,18 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"        name="OP-TEE/optee_client.git" />
-        <project path="optee_os"            name="OP-TEE/optee_os.git" />
-        <project path="optee_test"          name="OP-TEE/optee_test.git" />
-        <project path="build"               name="OP-TEE/build.git">
+        <project path="optee_client"        name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"            name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"          name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"               name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="qemu.mk" dest="build/Makefile" />
                 <linkfile src="../toolchains/aarch32/bin/arm-linux-gnueabihf-gdb" dest="build/gdb" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
         <project path="soc_term"             name="linaro-swg/soc_term.git"               revision="5493a6e7c264536f5ca63fe7511e5eed991e4f20" />
         <project path="u-boot"               name="linaro-swg/u-boot.git"                 revision="optee" />
 

diff --git a/dra7xx.xml b/dra7xx.xml
@@ -6,15 +6,15 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"   name="OP-TEE/optee_client.git" />
-        <project path="optee_os"       name="OP-TEE/optee_os.git" />
-        <project path="optee_test"     name="OP-TEE/optee_test.git" />
-        <project path="build"          name="OP-TEE/build.git">
+        <project path="optee_client"   name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="dra7xx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples" name="linaro-swg/optee_examples.git"       revision="master" />
+        <project path="optee_examples" name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />

diff --git a/fvp.xml b/fvp.xml
@@ -6,16 +6,16 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"         name="OP-TEE/optee_client.git" />
-        <project path="optee_os"             name="OP-TEE/optee_os.git" />
-        <project path="optee_test"           name="OP-TEE/optee_test.git" />
-        <project path="build"                name="OP-TEE/build.git">
+        <project path="optee_client"         name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="fvp.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="arm-trusted-firmware" name="ARM-software/arm-trusted-firmware.git" revision="34efb683e32254b8c325ac3071c5776d243a7b99" />

diff --git a/hikey.xml b/hikey.xml
@@ -6,16 +6,16 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"         name="OP-TEE/optee_client.git" />
-        <project path="optee_os"             name="OP-TEE/optee_os.git" />
-        <project path="optee_test"           name="OP-TEE/optee_test.git" />
-        <project path="build"                name="OP-TEE/build.git">
+        <project path="optee_client"         name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="hikey.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
         <project path="patches_hikey"        name="linaro-swg/patches_hikey.git"          revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96" />
 
         <!-- Misc gits -->

diff --git a/hikey960.xml b/hikey960.xml
@@ -6,15 +6,15 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"          name="OP-TEE/optee_client.git" />
-        <project path="optee_os"              name="OP-TEE/optee_os.git" />
-        <project path="optee_test"            name="OP-TEE/optee_test.git" />
-        <project path="build"                 name="OP-TEE/build.git">
+        <project path="optee_client"          name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"              name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"            name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"                 name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="hikey960.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples"        name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"        name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
         <project path="patches_hikey"         name="linaro-swg/patches_hikey.git"             revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96" />
 
         <!-- Misc gits -->

diff --git a/juno.xml b/juno.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-        <remote name="github" fetch="https://github.com" />
-        <remote name="linaro" fetch="https://git.linaro.org" />
-
-        <default remote="github" revision="master" />
-
-        <!-- OP-TEE gits -->
-        <project path="optee_client"         name="OP-TEE/optee_client.git" />
-        <project path="optee_os"             name="OP-TEE/optee_os.git" />
-        <project path="optee_test"           name="OP-TEE/optee_test.git" />
-        <project path="build"                name="OP-TEE/build.git">
-                <linkfile src="juno.mk" dest="build/Makefile" />
-        </project>
-
-        <!-- linaro-swg gits -->
-        <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
-
-        <!-- Misc gits -->
-        <project path="arm-trusted-firmware" name="ARM-software/arm-trusted-firmware.git" revision="34efb683e32254b8c325ac3071c5776d243a7b99" />
-        <project path="buildroot"            name="buildroot/buildroot.git"               revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />
-        <project path="u-boot"               name="u-boot/u-boot.git"                     revision="refs/tags/v2018.03" clone-depth="1" />
-        <project path="vexpress-firmware"    name="arm/vexpress-firmware.git"             revision="670a8336738046ac910f4ed3746edc1b4ecf086c" remote="linaro"/>
-</manifest>

diff --git a/poplar.xml b/poplar.xml
@@ -5,15 +5,15 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="build"                name="OP-TEE/build.git" >
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1" >
                 <linkfile src="poplar.mk" dest="build/Makefile" />
         </project>
-        <project path="optee_client"         name="OP-TEE/optee_client.git" />
-        <project path="optee_os"             name="OP-TEE/optee_os.git" />
-        <project path="optee_test"           name="OP-TEE/optee_test.git" />
+        <project path="optee_client"         name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
 
         <!-- 96boards-poplar gits -->
         <project path="linux"                name="96boards-poplar/linux.git"             revision="poplar-4.9" clone-depth="1" />

diff --git a/qemu_v8.xml b/qemu_v8.xml
@@ -5,18 +5,18 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"         name="OP-TEE/optee_client.git" />
-        <project path="optee_os"             name="OP-TEE/optee_os.git" />
-        <project path="optee_test"           name="OP-TEE/optee_test.git" />
-        <project path="build"                name="OP-TEE/build.git">
+        <project path="optee_client"         name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="qemu_v8.mk" dest="build/Makefile" />
                 <linkfile src="../toolchains/aarch64/bin/aarch64-linux-gnu-gdb" dest="build/gdb" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git"/>
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.6.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
         <project path="soc_term"             name="linaro-swg/soc_term.git"               revision="5493a6e7c264536f5ca63fe7511e5eed991e4f20" />
 
         <!-- Misc gits -->

diff --git a/rpi3.xml b/rpi3.xml
@@ -5,19 +5,19 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"         name="OP-TEE/optee_client.git" />
-        <project path="optee_os"             name="OP-TEE/optee_os.git" />
-        <project path="optee_test"           name="OP-TEE/optee_test.git" />
-        <project path="build"                name="OP-TEE/build.git">
+        <project path="optee_client"         name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="rpi3.mk" dest="build/Makefile" />
                 <linkfile src="rpi3/debugger/pi3.cfg" dest="build/pi3.cfg" />
                 <linkfile src="../toolchains/aarch64/bin/aarch64-linux-gnu-gdb" dest="build/gdb" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="rpi3-optee-4.14" clone-depth="1" />
-        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git"/>
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.6.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.6.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="arm-trusted-firmware" name="ARM-software/arm-trusted-firmware.git" revision="023bc019e95ca98687f015074c938941a0546eb7" />

diff --git a/synquacer.xml b/synquacer.xml
@@ -5,10 +5,10 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"         name="OP-TEE/optee_client.git" />
-        <project path="optee_os"             name="OP-TEE/optee_os.git" />
-        <project path="optee_test"           name="OP-TEE/optee_test.git" />
-        <project path="build"                name="OP-TEE/build.git">
+        <project path="optee_client"         name="OP-TEE/optee_client.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.6.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.6.0" clone-depth="1">
                 <linkfile src="synquacer.mk" dest="build/Makefile" />
         </project>