summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2015-10-14 11:53:52 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2015-10-14 11:53:57 +0100
commit0bd55b9db260e391f4eb61a141a8a8375d6b9096 (patch)
tree86025de4914723c71281ae15f33d254ba394158a
parent05449c113534bd4c4b0fc15d1c200d9b093637b5 (diff)
15.10: update u-boot
Update the u-boot tree to point to the latest denx.de u-boot/master now that all our patches are upstream. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--pinned-latest.xml2
-rw-r--r--pinned-lsk.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/pinned-latest.xml b/pinned-latest.xml
index 7031a87..3b2abee 100644
--- a/pinned-latest.xml
+++ b/pinned-latest.xml
@@ -13,6 +13,6 @@
<project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="ea31f8eb0ca0500212fc577c17b4a48e6d2656af" upstream="master"/>
<project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="fa3170b92d1372fb9b96d596c1a65b0fa25c69ff" 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="bfb6571d32ce003c8d15bccc09e90ec5d5bde0f0" upstream="master"/>
+ <project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="87a9595709adfa60644a93c261fcc2b75cfd2a1a" upstream="master"/>
<project name="uefi/uefi-tools.git" path="uefi/uefi-tools" remote="linaro" revision="cc0549f34bd18ecd5059b4a496f679a284fa58d3" upstream="master"/>
</manifest>
diff --git a/pinned-lsk.xml b/pinned-lsk.xml
index f5adccc..95b8c89 100644
--- a/pinned-lsk.xml
+++ b/pinned-lsk.xml
@@ -13,6 +13,6 @@
<project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="a8a23973fcb8315577c296dc2916a1396f67583e" upstream="lsk-3.18-armlt"/>
<project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="fa3170b92d1372fb9b96d596c1a65b0fa25c69ff" 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="bfb6571d32ce003c8d15bccc09e90ec5d5bde0f0" upstream="master"/>
+ <project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="87a9595709adfa60644a93c261fcc2b75cfd2a1a" upstream="master"/>
<project name="uefi/uefi-tools.git" path="uefi/uefi-tools" remote="linaro" revision="cc0549f34bd18ecd5059b4a496f679a284fa58d3" upstream="master"/>
</manifest>