summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2017-01-09 15:57:12 +0000
committerRyan Harkin <ryan.harkin@linaro.org>2017-01-09 16:05:42 +0000
commitc9efae4efabe45aeb850c5a5aa0670426c2bc132 (patch)
tree8065d8a52f49cab3e0f9ea13e7fcb7e9993c1ab2
parentc6fed011e1b802ff78d9cfa77b0827b564c4bbe4 (diff)
Revert to 2.2.0 release of OPTEE
Various problems with the latest OPTEE and compatibility with xtest as used in Android releases meant that xtest was failing after I updated. Bisecting the problem shows that this commit causes the failure: 621564d 2016-10-18 core: REE FS: use new RPC functions [Jens Wiklander] ... due to needing a corresponding xtest update. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--latest.xml6
-rw-r--r--lsk.xml6
-rw-r--r--pinned-latest.xml4
-rw-r--r--pinned-lsk.xml4
-rw-r--r--pinned-uefi.xml4
-rw-r--r--uefi.xml6
6 files changed, 15 insertions, 15 deletions
diff --git a/latest.xml b/latest.xml
index aa76a13..78b1a63 100644
--- a/latest.xml
+++ b/latest.xml
@@ -19,8 +19,8 @@
<project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="master" upstream="master"/>
<project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="master" upstream="master"/>
<project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
- <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="master" upstream="master"/>
- <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="master" upstream="master"/>
- <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="master" upstream="master"/>
+ <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="658ae538f76a2624b7f9c40539a600d281d872b4" upstream="master"/>
+ <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
+ <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="c0c5d399d81a0669f5c8e3bcb20039d65649a78d" upstream="master"/>
<project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="master" upstream="master"/>
</manifest>
diff --git a/lsk.xml b/lsk.xml
index e7e5355..c54d43a 100644
--- a/lsk.xml
+++ b/lsk.xml
@@ -19,8 +19,8 @@
<project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="master" upstream="master"/>
<project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="master" upstream="master"/>
<project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
- <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="master" upstream="master"/>
- <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="master" upstream="master"/>
- <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="master" upstream="master"/>
+ <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="658ae538f76a2624b7f9c40539a600d281d872b4" upstream="master"/>
+ <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
+ <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="c0c5d399d81a0669f5c8e3bcb20039d65649a78d" upstream="master"/>
<project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="master" upstream="master"/>
</manifest>
diff --git a/pinned-latest.xml b/pinned-latest.xml
index 59ebd78..658bf25 100644
--- a/pinned-latest.xml
+++ b/pinned-latest.xml
@@ -19,8 +19,8 @@
<project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="b57c098ca0561ff39aa70b3fe2c795b7a0108717" upstream="master"/>
<project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="e0c62721cc0ac562a0d7c5c5cbe3164fe34941b5" upstream="master"/>
<project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
- <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="6432f5194822d7da586d736e8733d7b78401bdec" upstream="master"/>
+ <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="658ae538f76a2624b7f9c40539a600d281d872b4" upstream="master"/>
<project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
- <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="ac3be63f919cd24bef6a3c9e39729b9027c50a50" upstream="master"/>
+ <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="c0c5d399d81a0669f5c8e3bcb20039d65649a78d" upstream="master"/>
<project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="8c8bfc6263e81242ea51f1f9e304078dda70e149" upstream="master"/>
</manifest>
diff --git a/pinned-lsk.xml b/pinned-lsk.xml
index ed1db3e..0626c32 100644
--- a/pinned-lsk.xml
+++ b/pinned-lsk.xml
@@ -19,8 +19,8 @@
<project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="b57c098ca0561ff39aa70b3fe2c795b7a0108717" upstream="master"/>
<project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="e0c62721cc0ac562a0d7c5c5cbe3164fe34941b5" upstream="master"/>
<project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
- <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="6432f5194822d7da586d736e8733d7b78401bdec" upstream="master"/>
+ <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="658ae538f76a2624b7f9c40539a600d281d872b4" upstream="master"/>
<project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
- <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="ac3be63f919cd24bef6a3c9e39729b9027c50a50" upstream="master"/>
+ <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="c0c5d399d81a0669f5c8e3bcb20039d65649a78d" upstream="master"/>
<project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="8c8bfc6263e81242ea51f1f9e304078dda70e149" upstream="master"/>
</manifest>
diff --git a/pinned-uefi.xml b/pinned-uefi.xml
index d84bed6..ced28a0 100644
--- a/pinned-uefi.xml
+++ b/pinned-uefi.xml
@@ -14,8 +14,8 @@
<project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="ecdcf760f11a6c0f36923857d1d7e0fbb2655f86" upstream="master"/>
<project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="5ad54b661fb30bad6667c62daf2ba929805ff127" upstream="master"/>
<project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
- <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="6432f5194822d7da586d736e8733d7b78401bdec" upstream="master"/>
+ <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="658ae538f76a2624b7f9c40539a600d281d872b4" upstream="master"/>
<project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
- <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="ac3be63f919cd24bef6a3c9e39729b9027c50a50" upstream="master"/>
+ <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="c0c5d399d81a0669f5c8e3bcb20039d65649a78d" upstream="master"/>
<project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="8c8bfc6263e81242ea51f1f9e304078dda70e149" upstream="master"/>
</manifest>
diff --git a/uefi.xml b/uefi.xml
index 8dc6a21..bf1dd0a 100644
--- a/uefi.xml
+++ b/uefi.xml
@@ -14,8 +14,8 @@
<project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="master" upstream="master"/>
<project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="master" upstream="master"/>
<project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
- <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="master" upstream="master"/>
- <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="master" upstream="master"/>
- <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="master" upstream="master"/>
+ <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="658ae538f76a2624b7f9c40539a600d281d872b4" upstream="master"/>
+ <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
+ <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="c0c5d399d81a0669f5c8e3bcb20039d65649a78d" upstream="master"/>
<project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="master" upstream="master"/>
</manifest>