summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2016-06-01 14:08:59 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2016-06-01 14:08:59 +0100
commit62179af5b971d694b693f484c99b07a438f31aa1 (patch)
tree67e850caecc23b3d43677afdaf3d6e7cd63b8246
parent308372b31b6d79cbe5e85c16a0b5a3a159d071df (diff)
Rebase u-boot and UEFI to latest upstream
The u-boot and UEFI trees are updated to the latest upstream code from the end of May 2016. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--pinned-latest.xml6
-rw-r--r--pinned-lsk.xml6
-rw-r--r--pinned-uefi.xml4
3 files changed, 8 insertions, 8 deletions
diff --git a/pinned-latest.xml b/pinned-latest.xml
index df9c2c6..183c5f7 100644
--- a/pinned-latest.xml
+++ b/pinned-latest.xml
@@ -11,13 +11,13 @@
<project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="8c726fbf8dac371c65745eb6e9ac03c449a912db" upstream="juno"/>
<project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="31580bb7bd502c94946b936678b2befe6b09fe0f" upstream="vexpress"/>
<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/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="f25bbdd05b5ff2ec39b2f0169f98afeef577cc2a" upstream="master"/>
<project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="e224d4f7f807504fe680860d8a4b577c1583aa1f" upstream="armlt"/>
- <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="50af30e42622099ef2f300e8880396b2b398e9e7" upstream="master"/>
+ <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="2d63bdfbaa6e1b3703c533000cf2f2d3b1ca7021" upstream="master"/>
<project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="df6738ba76101bc44b5a70e060082663a2bba08a" upstream="latest-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"/>
+ <project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="6fb59f097651888f9cfbed89dad5fcbc91e4d13d" upstream="master"/>
<project name="landing-teams/working/arm/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="b9a106861c735f1acfed31359e1af16f4741317d" 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="fcd1014947e784ca8d618035bcb999f9151096b0" upstream="master"/>
diff --git a/pinned-lsk.xml b/pinned-lsk.xml
index a9b37c5..490e47a 100644
--- a/pinned-lsk.xml
+++ b/pinned-lsk.xml
@@ -11,13 +11,13 @@
<project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="8c726fbf8dac371c65745eb6e9ac03c449a912db" upstream="juno"/>
<project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="31580bb7bd502c94946b936678b2befe6b09fe0f" upstream="vexpress"/>
<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/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="f25bbdd05b5ff2ec39b2f0169f98afeef577cc2a" upstream="master"/>
<project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="e224d4f7f807504fe680860d8a4b577c1583aa1f" upstream="armlt"/>
- <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="50af30e42622099ef2f300e8880396b2b398e9e7" upstream="master"/>
+ <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="2d63bdfbaa6e1b3703c533000cf2f2d3b1ca7021" upstream="master"/>
<project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="aac5b1745630627256dcc270b7bbaa4f62bc7d90" 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"/>
+ <project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="6fb59f097651888f9cfbed89dad5fcbc91e4d13d" upstream="master"/>
<project name="landing-teams/working/arm/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="b9a106861c735f1acfed31359e1af16f4741317d" 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="fcd1014947e784ca8d618035bcb999f9151096b0" upstream="master"/>
diff --git a/pinned-uefi.xml b/pinned-uefi.xml
index 41f1134..e81556c 100644
--- a/pinned-uefi.xml
+++ b/pinned-uefi.xml
@@ -8,9 +8,9 @@
<project name="acpica/acpica" path="tools/acpica" remote="github" revision="e9c75ca267262326e80d49a290e8387a5963e2d2" upstream="master"/>
<project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="8c726fbf8dac371c65745eb6e9ac03c449a912db" upstream="juno"/>
<project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="31580bb7bd502c94946b936678b2befe6b09fe0f" upstream="vexpress"/>
- <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="eaf04c39c58f4e3a3bb48370aa42fe908b663f8d" upstream="master"/>
+ <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="f25bbdd05b5ff2ec39b2f0169f98afeef577cc2a" upstream="master"/>
<project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="e224d4f7f807504fe680860d8a4b577c1583aa1f" upstream="armlt"/>
- <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="50af30e42622099ef2f300e8880396b2b398e9e7" upstream="master"/>
+ <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="2d63bdfbaa6e1b3703c533000cf2f2d3b1ca7021" upstream="master"/>
<project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="d07b6bafa278205880251e067c908c2301c0b880" upstream="master"/>
<project name="landing-teams/working/arm/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="b9a106861c735f1acfed31359e1af16f4741317d" upstream="master"/>
<project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>