summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2016-05-11 18:06:24 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2016-05-11 18:06:24 +0100
commit7910c0cd104539a2e158ab5da912dcd49b0a2e7c (patch)
tree8d319a387503cca417f169bc23032a43e25ca6ef
parentc948ffe3565ac1750fe5275577f2aac764f7cba0 (diff)
Update to latest upstream trees in pinned manifests
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--pinned-latest.xml8
-rw-r--r--pinned-lsk.xml8
-rw-r--r--pinned-uefi.xml2
3 files changed, 9 insertions, 9 deletions
diff --git a/pinned-latest.xml b/pinned-latest.xml
index be85cdf..d490551 100644
--- a/pinned-latest.xml
+++ b/pinned-latest.xml
@@ -6,15 +6,15 @@
<remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
<remote fetch="https://github.com/OP-TEE/" name="optee"/>
- <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="32d4f826875a49fe1c4632aa71d1c04372b386aa" upstream="master"/>
+ <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="8fc835775b850446f021d1085f92adba6788e01c" upstream="master"/>
<project name="acpica/acpica" path="tools/acpica" remote="github" revision="e9c75ca267262326e80d49a290e8387a5963e2d2" upstream="master"/>
<project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="80459c31354e9daf840314b1d13caf2246335a2f" upstream="junor1"/>
<project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="31580bb7bd502c94946b936678b2befe6b09fe0f" upstream="vexpress"/>
- <project name="busybox" remote="busybox" revision="2fbc3123a2d94a85317b2269c724939db7e18fbf" upstream="master"/>
+ <project name="busybox" remote="busybox" revision="f2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af" upstream="master"/>
<project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="eaf04c39c58f4e3a3bb48370aa42fe908b663f8d" upstream="master"/>
<project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="92919dfe7668081b715cb6872ee0cd06881b5cc3" upstream="master"/>
<project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="50af30e42622099ef2f300e8880396b2b398e9e7" upstream="master"/>
- <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="5cad30cdff48d6e335c3d9f0389e64258ca095ae" upstream="latest-armlt"/>
+ <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="c977ae7428002a6784b693643b891e6d2c4d3a17" upstream="lsk-3.18-armlt"/>
<project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="d07b6bafa278205880251e067c908c2301c0b880" upstream="master"/>
<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="3d222eadf871160c04d8a72f63e0312a3cf748ca" upstream="master"/>
@@ -22,5 +22,5 @@
<project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
<project name="optee_client.git" path="optee/optee_client" remote="optee" revision="fcd1014947e784ca8d618035bcb999f9151096b0" upstream="master"/>
<project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="f9779c6095dd2e2f492e27a6d79f2c766d3e5714" upstream="master"/>
- <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="7315b7b47303ec73b8f5a994c37bb6bed0d00e37" upstream="master"/>
+ <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="fdf35d01c3803c71e7cfb167be31c7a8e370b5a0" upstream="master"/>
</manifest>
diff --git a/pinned-lsk.xml b/pinned-lsk.xml
index 421b5c1..d490551 100644
--- a/pinned-lsk.xml
+++ b/pinned-lsk.xml
@@ -6,15 +6,15 @@
<remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
<remote fetch="https://github.com/OP-TEE/" name="optee"/>
- <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="32d4f826875a49fe1c4632aa71d1c04372b386aa" upstream="master"/>
+ <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="8fc835775b850446f021d1085f92adba6788e01c" upstream="master"/>
<project name="acpica/acpica" path="tools/acpica" remote="github" revision="e9c75ca267262326e80d49a290e8387a5963e2d2" upstream="master"/>
<project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="80459c31354e9daf840314b1d13caf2246335a2f" upstream="junor1"/>
<project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="31580bb7bd502c94946b936678b2befe6b09fe0f" upstream="vexpress"/>
- <project name="busybox" remote="busybox" revision="2fbc3123a2d94a85317b2269c724939db7e18fbf" upstream="master"/>
+ <project name="busybox" remote="busybox" revision="f2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af" upstream="master"/>
<project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="eaf04c39c58f4e3a3bb48370aa42fe908b663f8d" upstream="master"/>
<project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="92919dfe7668081b715cb6872ee0cd06881b5cc3" upstream="master"/>
<project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="50af30e42622099ef2f300e8880396b2b398e9e7" upstream="master"/>
- <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="9aebb6b7ae6088969d548097b4ecea5982b1f27e" upstream="lsk-3.18-armlt"/>
+ <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="c977ae7428002a6784b693643b891e6d2c4d3a17" upstream="lsk-3.18-armlt"/>
<project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="d07b6bafa278205880251e067c908c2301c0b880" upstream="master"/>
<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="3d222eadf871160c04d8a72f63e0312a3cf748ca" upstream="master"/>
@@ -22,5 +22,5 @@
<project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
<project name="optee_client.git" path="optee/optee_client" remote="optee" revision="fcd1014947e784ca8d618035bcb999f9151096b0" upstream="master"/>
<project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="f9779c6095dd2e2f492e27a6d79f2c766d3e5714" upstream="master"/>
- <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="7315b7b47303ec73b8f5a994c37bb6bed0d00e37" upstream="master"/>
+ <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="fdf35d01c3803c71e7cfb167be31c7a8e370b5a0" upstream="master"/>
</manifest>
diff --git a/pinned-uefi.xml b/pinned-uefi.xml
index cd9d054..2545ded 100644
--- a/pinned-uefi.xml
+++ b/pinned-uefi.xml
@@ -4,7 +4,7 @@
<remote fetch="https://git.linaro.org/" name="linaro"/>
<remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
- <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="32d4f826875a49fe1c4632aa71d1c04372b386aa" upstream="master"/>
+ <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="8fc835775b850446f021d1085f92adba6788e01c" upstream="master"/>
<project name="acpica/acpica" path="tools/acpica" remote="github" revision="e9c75ca267262326e80d49a290e8387a5963e2d2" upstream="master"/>
<project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="80459c31354e9daf840314b1d13caf2246335a2f" upstream="junor1"/>
<project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="31580bb7bd502c94946b936678b2befe6b09fe0f" upstream="vexpress"/>