summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2017-03-03 02:54:35 +0000
committerVishal Bhoj <vishal.bhoj@linaro.org>2017-03-03 03:07:44 +0000
commitb851d9e3d96d7c327168c1e9b32ae2623afa8418 (patch)
tree89d00fa8f54346d154c0635a62850e4248fec18e
parent5beece71aeb87d9b934db904dd2013db6db42a1f (diff)
downloadmanifest-b851d9e3d96d7c327168c1e9b32ae2623afa8418.tar.gz
fix optee integration
Change-Id: I1d31a29d4350fdda0acf570453160d469c82eb95 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--linaro.xml2
-rw-r--r--tv.xml15
2 files changed, 4 insertions, 13 deletions
diff --git a/linaro.xml b/linaro.xml
index bf92d7355..10b09d9c1 100644
--- a/linaro.xml
+++ b/linaro.xml
@@ -30,7 +30,7 @@
<!-- Let's pull in more current versions of hikey device configs -->
<remove-project name="device/linaro/hikey"/>
<remove-project name="device/linaro/hikey-kernel"/>
- <project path="device/linaro/hikey" name="device/linaro/hikey" revision="master" remote="aosp" groups="device,hikey" />
+ <project path="device/linaro/hikey" name="device/linaro/hikey" revision="a0499690e0b21e8857d4442c5e4838b66d82f275" remote="aosp" groups="device,hikey" />
<project path="device/linaro/hikey-kernel" name="device/linaro/hikey-kernel" revision="master" remote="aosp" groups="device,hikey" />
<!-- Linaro Kernels -->
diff --git a/tv.xml b/tv.xml
index caabcdb8f..ae4093885 100644
--- a/tv.xml
+++ b/tv.xml
@@ -2,16 +2,7 @@
<manifest>
<remote name="github" fetch="https://github.com/" />
-
- <project path="device/linaro/bootloader/optee_test" name="OP-TEE/optee_test" revision="master" remote="github" />
-
- <project path="device/linaro/bootloader/optee_client" name="OP-TEE/optee_client" revision="master" remote="github" />
-
- <project path="device/linaro/bootloader/optee_os" name="OP-TEE/optee_os" revision="master" remote="github" />
-
- <project path="device/linaro/bootloader/optee_hello_world" name="kuscsik/lcu14_optee_hello_world" revision="master" remote="github" />
-
- <project path="device/linaro/bootloader/arm-trusted-firmware" name="device/linaro/bootloader/arm-trusted-firmware" revision="master" remote="aosp" />
- <project path="device/linaro/bootloader/edk2" name="device/linaro/bootloader/edk2" revision="master" remote="aosp" />
- <project path="device/linaro/bootloader/OpenPlatformPkg" name="device/linaro/bootloader/OpenPlatformPkg" revision="master" remote="aosp" />
+ <project path="external/optee_test" name="OP-TEE/optee_test" revision="refs/tags/2.2.0" remote="github"/>
+ <project path="external/optee_client" name="OP-TEE/optee_client" revision="refs/tags/2.2.0" remote="github"/>
+ <project path="optee/optee_os" name="OP-TEE/optee_os" revision="refs/tags/2.2.0" remote="github"/>
</manifest>