Stable versions of manifests on 2.5.0

Change-Id: I297b6e294f424cbef2c70cfc644d683c321d3065
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
diff --git a/am43xx_stable.xml b/am43xx_stable.xml
new file mode 100644
index 0000000..43f630e
--- /dev/null
+++ b/am43xx_stable.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+  <remote fetch="git://busybox.net" name="busybox"/>
+  <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
+  <remote fetch="https://github.com/OP-TEE" name="optee"/>
+  <remote fetch="git://git.ti.com/ti-linux-kernel" name="ti-linux"/>
+  <remote fetch="git://git.ti.com/ti-u-boot" name="ti-u-boot"/>
+  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0">
+    <linkfile dest="build/Makefile" src="am43xx.mk"/>
+  </project>
+  <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
+  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
+  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="c7509c9ba90a83c71207bbd8f40f218904842b0b"/>
+  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="b79c87e6f7e2d24f262754845c6fc5f45b71bf15"/>
+</manifest>
diff --git a/am57xx_stable.xml b/am57xx_stable.xml
new file mode 100644
index 0000000..072cb79
--- /dev/null
+++ b/am57xx_stable.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+  <remote fetch="git://busybox.net" name="busybox"/>
+  <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
+  <remote fetch="https://github.com/OP-TEE" name="optee"/>
+  <remote fetch="git://git.ti.com/ti-linux-kernel" name="ti-linux"/>
+  <remote fetch="git://git.ti.com/ti-u-boot" name="ti-u-boot"/>
+  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0">
+    <linkfile dest="build/Makefile" src="am57xx.mk"/>
+  </project>
+  <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
+  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
+  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="c7509c9ba90a83c71207bbd8f40f218904842b0b"/>
+  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="b79c87e6f7e2d24f262754845c6fc5f45b71bf15"/>
+</manifest>
diff --git a/default_stable.xml b/default_stable.xml
index 9a13440..7bc4c09 100644
--- a/default_stable.xml
+++ b/default_stable.xml
@@ -6,18 +6,18 @@
   <remote fetch="https://github.com/qemu" name="qemu"/>
   <default remote="optee" revision="master"/>
   <project name="bios_qemu_tz_arm.git" path="bios_qemu_tz_arm" remote="linaro-swg" revision="c076d8e4caa25597e72d81a01b594e3d0c8e7a5f"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0-rc1">
+  <project name="build.git" path="build" revision="refs/tags/2.5.0">
     <linkfile dest="build/Makefile" src="qemu.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
+  <project name="dtc.git" path="qemu/dtc" remote="qemu" revision="d990b8013889b816ec054c7e07a77db59c56c400"/>
   <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="d71b5ccdbd97407482bca123f12cd60f8d227adf"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="2e26af92fd860371fd65a2c16306cce4508285a1"/>
-  <project name="optee_benchmark.git" path="optee_benchmark" remote="linaro-swg" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0-rc1"/>
+  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
+  <project name="optee_benchmark.git" path="optee_benchmark" remote="linaro-swg" revision="refs/tags/2.5.0"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
   <project name="qemu.git" path="qemu" remote="qemu" revision="199e19ee538eb61fd08b1c1ee5aa838ebdcc968e"/>
-  <project name="dtc.git" path="qemu/dtc" remote="qemu" revision="558cd81bdd432769b59bff01240c44f82cfb1a9d"/>
   <project name="soc_term.git" path="soc_term" remote="linaro-swg" revision="5493a6e7c264536f5ca63fe7511e5eed991e4f20"/>
 </manifest>
diff --git a/dra7xx_stable.xml b/dra7xx_stable.xml
index 2cf1531..6d7a721 100644
--- a/dra7xx_stable.xml
+++ b/dra7xx_stable.xml
@@ -5,15 +5,15 @@
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <remote fetch="git://git.ti.com/ti-linux-kernel" name="ti-linux"/>
   <remote fetch="git://git.ti.com/ti-u-boot" name="ti-u-boot"/>
-  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0-rc1">
+  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0">
     <linkfile dest="build/Makefile" src="dra7xx.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
   <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="d71b5ccdbd97407482bca123f12cd60f8d227adf"/>
-  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0-rc1"/>
-  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="c035928ff9b3409185f79544e9e131383085a2ac"/>
-  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="edf25d94d55c42994b2187e4884b89789fd82324"/>
+  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
+  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="c7509c9ba90a83c71207bbd8f40f218904842b0b"/>
+  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="b79c87e6f7e2d24f262754845c6fc5f45b71bf15"/>
 </manifest>
diff --git a/fvp_stable.xml b/fvp_stable.xml
index 9d3ffa1..5b6f58a 100644
--- a/fvp_stable.xml
+++ b/fvp_stable.xml
@@ -6,16 +6,16 @@
   <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <default remote="optee" revision="master"/>
-  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="0d6e84bc2c68de1602de6fbadeae109eb8298c18"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0-rc1">
+  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="bdadbc6fc1109110181a417c6aaf6723aa62dc09"/>
+  <project name="build.git" path="build" revision="refs/tags/2.5.0">
     <linkfile dest="build/Makefile" src="fvp.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
   <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="d71b5ccdbd97407482bca123f12cd60f8d227adf"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="2e26af92fd860371fd65a2c16306cce4508285a1"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0-rc1"/>
+  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
   <project name="working/arm/edk2.git" path="edk2" remote="landing-teams" revision="131aec010f565a747ac51e6a95e30a37b5df15cc"/>
 </manifest>
diff --git a/hikey_debian_stable.xml b/hikey_debian_stable.xml
index d22f23b..001476e 100644
--- a/hikey_debian_stable.xml
+++ b/hikey_debian_stable.xml
@@ -11,19 +11,19 @@
   <default remote="optee" revision="master"/>
   <project name="OpenPlatformPkg" remote="96b-hk" revision="56dec05002f6870928336da5da99d1e1027692e8"/>
   <project name="arm-trusted-firmware" remote="96b-hk" revision="fb1158a365e2bf5bba638cde950678fddf67fe60"/>
-  <project name="build" revision="refs/tags/2.5.0-rc1">
+  <project name="build" revision="refs/tags/2.5.0">
     <linkfile dest="build/Makefile" src="hikey_debian.mk"/>
   </project>
   <project name="burn-boot" remote="96boards" revision="db522b114fdec4d06d0a1705501fedc277903453"/>
   <project name="ci/debian-kernel-packaging" path="debian-kernel-packaging" remote="linaro-git" revision="14c6e0022cfdbd757a7be5a0d950efe043cdec9f"/>
-  <project name="code" path="strace" remote="sfnet" revision="663b4f8273643372434c8e40a8fa20cdb1aade97"/>
-  <project name="edk2" remote="96b-hk" revision="620ce09af5953caf7099b602c6252bc1bee2241b"/>
+  <project name="code" path="strace" remote="sfnet" revision="735c2ad872047e5d66c28eab2dc1aae31aac96ab"/>
+  <project name="edk2" remote="96b-hk" revision="202895d521a168dfaea4c9ae4521049913d37e9d"/>
   <project name="grub" remote="savannah" revision="e54c99aaff5e5f6f5d3b06028506c57e66d8ef77"/>
-  <project name="hello_world" remote="linaro-swg" revision="d71b5ccdbd97407482bca123f12cd60f8d227adf"/>
+  <project name="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
   <project name="l-loader" remote="96b-hk" revision="cddd213c1b820d5f224d20b38581c504552dd59e"/>
-  <project name="optee_client" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_os" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_test" revision="refs/tags/2.5.0-rc1"/>
+  <project name="optee_client" revision="refs/tags/2.5.0"/>
+  <project name="optee_os" revision="refs/tags/2.5.0"/>
+  <project name="optee_test" revision="refs/tags/2.5.0"/>
   <project name="patches_hikey" remote="linaro-swg" revision="93d4254c66003cacd9f7e84dd6b5831ab43b5265"/>
   <project name="rpk" path="linux" remote="linaro" revision="04ec80a78dbc970cf921abc02910d2148cec6dbb"/>
 </manifest>
diff --git a/hikey_stable.xml b/hikey_stable.xml
index f12423b..b075da5 100644
--- a/hikey_stable.xml
+++ b/hikey_stable.xml
@@ -9,20 +9,20 @@
   <remote fetch="git://git.code.sf.net/p/strace" name="sfnet"/>
   <default remote="optee" revision="master"/>
   <project name="arm-trusted-firmware" remote="96b-hk" revision="fb1158a365e2bf5bba638cde950678fddf67fe60"/>
-  <project name="build" revision="refs/tags/2.5.0-rc1">
+  <project name="build" revision="refs/tags/2.5.0">
     <linkfile dest="build/Makefile" src="hikey.mk"/>
   </project>
   <project name="burn-boot" remote="96boards" revision="db522b114fdec4d06d0a1705501fedc277903453"/>
   <project name="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="code" path="strace" remote="sfnet" revision="663b4f8273643372434c8e40a8fa20cdb1aade97"/>
+  <project name="code" path="strace" remote="sfnet" revision="735c2ad872047e5d66c28eab2dc1aae31aac96ab"/>
   <project name="edk2" remote="96boards" revision="7da6cdf18127ee52e79f3cf990c8d630fd037784"/>
   <project name="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
   <project name="grub" remote="savannah" revision="e54c99aaff5e5f6f5d3b06028506c57e66d8ef77"/>
-  <project name="hello_world" remote="linaro-swg" revision="d71b5ccdbd97407482bca123f12cd60f8d227adf"/>
+  <project name="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
   <project name="l-loader" remote="96b-hk" revision="cddd213c1b820d5f224d20b38581c504552dd59e"/>
-  <project name="linux" remote="linaro-swg" revision="2e26af92fd860371fd65a2c16306cce4508285a1"/>
-  <project name="optee_client" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_os" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_test" revision="refs/tags/2.5.0-rc1"/>
+  <project name="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
+  <project name="optee_client" revision="refs/tags/2.5.0"/>
+  <project name="optee_os" revision="refs/tags/2.5.0"/>
+  <project name="optee_test" revision="refs/tags/2.5.0"/>
   <project name="patches_hikey" remote="linaro-swg" revision="93d4254c66003cacd9f7e84dd6b5831ab43b5265"/>
 </manifest>
diff --git a/juno_stable.xml b/juno_stable.xml
index be41740..76e6505 100644
--- a/juno_stable.xml
+++ b/juno_stable.xml
@@ -7,17 +7,17 @@
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <remote fetch="git://git.denx.de" name="u-boot"/>
   <default remote="optee" revision="master"/>
-  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="0d6e84bc2c68de1602de6fbadeae109eb8298c18"/>
+  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="bdadbc6fc1109110181a417c6aaf6723aa62dc09"/>
   <project name="arm/vexpress-firmware.git" path="vexpress-firmware" remote="linaro" revision="cad383a2c4ffeb9192605fda54c07fd1aa09a1b0"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0-rc1">
+  <project name="build.git" path="build" revision="refs/tags/2.5.0">
     <linkfile dest="build/Makefile" src="juno.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
   <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="d71b5ccdbd97407482bca123f12cd60f8d227adf"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="2e26af92fd860371fd65a2c16306cce4508285a1"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0-rc1"/>
-  <project name="u-boot.git" path="u-boot" remote="u-boot" revision="08546df976b79b1694af3ff12b26baf2931f371a"/>
+  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
+  <project name="u-boot.git" path="u-boot" remote="u-boot" revision="7e09145ea2e985511c660bdf567b61614acd75b3"/>
 </manifest>
diff --git a/mt8173-evb_stable.xml b/mt8173-evb_stable.xml
index b50b76f..4521d4d 100644
--- a/mt8173-evb_stable.xml
+++ b/mt8173-evb_stable.xml
@@ -5,16 +5,16 @@
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <default remote="optee" revision="master"/>
   <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="8b2410cd5ab9189337379a9449c0f5588ae9b4a6"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0-rc1">
+  <project name="build.git" path="build" revision="refs/tags/2.5.0">
     <linkfile dest="build/Makefile" src="mediatek.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
   <project name="evb-utils.git" path="evb-utils" remote="linaro-swg" revision="5494df3c6881739ff2faff636379aaef569c0281"/>
   <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="d71b5ccdbd97407482bca123f12cd60f8d227adf"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="2e26af92fd860371fd65a2c16306cce4508285a1"/>
+  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
   <project name="mtk_tools.git" path="mtk_tools" remote="linaro-swg" revision="1460d821a19c7c81520605801026747e6be0e20e"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0-rc1"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
 </manifest>
diff --git a/qemu_v8_stable.xml b/qemu_v8_stable.xml
index 1ee2003..8f6061a 100644
--- a/qemu_v8_stable.xml
+++ b/qemu_v8_stable.xml
@@ -8,21 +8,21 @@
   <remote fetch="http://git.code.sf.net/p/strace" name="sfnet"/>
   <remote fetch="https://github.com/tianocore" name="tianocore"/>
   <default remote="optee" revision="master"/>
-  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="3fe1df3a038b0d69ea7c5c1de581ee6e1db28872"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0-rc1">
+  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="bdadbc6fc1109110181a417c6aaf6723aa62dc09"/>
+  <project name="build.git" path="build" revision="refs/tags/2.5.0">
     <linkfile dest="build/Makefile" src="qemu_v8.mk"/>
     <linkfile dest="build/gdb" src="../toolchains/aarch64/bin/aarch64-linux-gnu-gdb"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="code" path="strace" remote="sfnet" revision="663b4f8273643372434c8e40a8fa20cdb1aade97"/>
-  <project name="edk2.git" path="edk2" remote="tianocore" revision="1fb805b1eb5b6039cb12375f8594aba65bf60a44"/>
+  <project name="code" path="strace" remote="sfnet" revision="735c2ad872047e5d66c28eab2dc1aae31aac96ab"/>
+  <project name="dtc.git" path="qemu/dtc" remote="qemu" revision="d990b8013889b816ec054c7e07a77db59c56c400"/>
+  <project name="edk2.git" path="edk2" remote="tianocore" revision="f7bd152c2a05bd75471305184c25f14f01ccf0b7"/>
   <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="d71b5ccdbd97407482bca123f12cd60f8d227adf"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="2e26af92fd860371fd65a2c16306cce4508285a1"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0-rc1"/>
+  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
   <project name="qemu.git" path="qemu" remote="qemu" revision="199e19ee538eb61fd08b1c1ee5aa838ebdcc968e"/>
-  <project name="dtc.git" path="qemu/dtc" remote="qemu" revision="558cd81bdd432769b59bff01240c44f82cfb1a9d"/>
   <project name="soc_term.git" path="soc_term" remote="linaro-swg" revision="5493a6e7c264536f5ca63fe7511e5eed991e4f20"/>
 </manifest>
diff --git a/rpi3_stable.xml b/rpi3_stable.xml
index 34f23d7..0c7ac75 100644
--- a/rpi3_stable.xml
+++ b/rpi3_stable.xml
@@ -4,17 +4,17 @@
   <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="1da4e15529a32fa244f5e3effc9a90549beb1a26"/>
-  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0-rc1">
+  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0">
     <linkfile dest="build/Makefile" src="rpi3.mk"/>
     <linkfile dest="build/pi3.cfg" src="rpi3/debugger/pi3.cfg"/>
     <linkfile dest="build/gdb" src="../toolchains/aarch64/bin/aarch64-linux-gnu-gdb"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox_mirror" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
   <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="d71b5ccdbd97407482bca123f12cd60f8d227adf"/>
+  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
   <project name="linux.git" path="linux" remote="linaro-swg" revision="9f38d0f9d4aa32c8c2802be600d002eea222f9d1"/>
-  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0-rc1"/>
-  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0-rc1"/>
+  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0"/>
+  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0"/>
   <project name="u-boot.git" path="u-boot" remote="linaro-swg" revision="10577db76e77a513180388df1f176a6642143c84"/>
 </manifest>