Update EDK2 and OpenPlatformPkg to upstream reposarmlt-20170607-001

We no longer host any patches on top of EDK2, so we no longer need
forks for EDK2 or OpenPlatformPkg.

Use the upstream repos directly and sync to a recent commit.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

6 files changed, 12 insertions, 12 deletions

diff --git a/latest.xml b/latest.xml
index b0c73a3..2919fc2 100644
--- a/latest.xml
+++ b/latest.xml
@@ -11,9 +11,7 @@
   <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="juno" upstream="juno"/>
   <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
   <project name="busybox" remote="busybox" path="busybox" revision="master" upstream="master"/>
-  <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="armlt" upstream="armlt"/>
-  <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="latest-armlt" upstream="latest-armlt"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="master" upstream="master"/>
@@ -22,5 +20,7 @@
   <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="365657667f8968f40237480169fea44fa3fb9949" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="28fcee179fc908ee2001a135179366d794af7878" upstream="master"/>
+  <project name="tianocore/edk2" path="uefi/edk2" remote="github" revision="master" upstream="master"/>
   <project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="master" upstream="master"/>
+  <project name="uefi/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
 </manifest>
diff --git a/lsk.xml b/lsk.xml
index 3938ebf..ce978de 100644
--- a/lsk.xml
+++ b/lsk.xml
@@ -11,9 +11,7 @@
   <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="juno" upstream="juno"/>
   <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
   <project name="busybox" remote="busybox" path="busybox" revision="master" upstream="master"/>
-  <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="armlt" upstream="armlt"/>
-  <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="lsk-4.4-armlt" upstream="lsk-4.4-armlt"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="master" upstream="master"/>
@@ -22,5 +20,7 @@
   <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="365657667f8968f40237480169fea44fa3fb9949" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="28fcee179fc908ee2001a135179366d794af7878" upstream="master"/>
+  <project name="tianocore/edk2" path="uefi/edk2" remote="github" revision="master" upstream="master"/>
   <project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="master" upstream="master"/>
+  <project name="uefi/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
 </manifest>
diff --git a/pinned-latest.xml b/pinned-latest.xml
index c4c3d71..822ebe1 100644
--- a/pinned-latest.xml
+++ b/pinned-latest.xml
@@ -11,9 +11,7 @@
   <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="9978f0aac9febf8092f716835016f529f7321f7c" upstream="juno"/>
   <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="d9e8f81e7beeeeb0ffade64dc0b689e4fa11909e" upstream="vexpress"/>
   <project name="busybox" remote="busybox" revision="111cdcf295b4cab78521480f52b295d9ae719263" upstream="master"/>
-  <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="c06a2ef314cf8f2a1d5814ef16937c64f83b34bc" upstream="master"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="f8226efcee0cb0ae3388147e1ed86638b288488a" upstream="armlt"/>
-  <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="b9b663145f20d703f85e79568ad1c1ca05c3a88d" upstream="master"/>
   <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="1ae53e5decc2281320307fecc53d7299a1abb4c0" upstream="lsk-3.18-armlt"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="5ad54b661fb30bad6667c62daf2ba929805ff127" upstream="master"/>
   <project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="b57c098ca0561ff39aa70b3fe2c795b7a0108717" upstream="master"/>
@@ -22,5 +20,7 @@
   <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="1df4046bd729e866743454a18a71e72228e585fd" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="702609a7a5ff8c05ab54bc967d762f1acf18fd9d" upstream="master"/>
+  <project name="tianocore/edk2" path="uefi/edk2" remote="github" revision="401d1343cb0279908a748fd0ff27609ccc300b43" upstream="master"/>
   <project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="bb3cae00ef4f726b89972f3b1470ed1a9e802806" upstream="master"/>
+  <project name="uefi/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="470ab22d9ef4cd30459f234b14665bfe0b2287ed" upstream="master"/>
 </manifest>
diff --git a/pinned-lsk.xml b/pinned-lsk.xml
index 0714f81..afdb4ce 100644
--- a/pinned-lsk.xml
+++ b/pinned-lsk.xml
@@ -11,9 +11,7 @@
   <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="9978f0aac9febf8092f716835016f529f7321f7c" upstream="juno"/>
   <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="d9e8f81e7beeeeb0ffade64dc0b689e4fa11909e" upstream="vexpress"/>
   <project name="busybox" remote="busybox" revision="111cdcf295b4cab78521480f52b295d9ae719263" upstream="master"/>
-  <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="c06a2ef314cf8f2a1d5814ef16937c64f83b34bc" upstream="master"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="f8226efcee0cb0ae3388147e1ed86638b288488a" upstream="armlt"/>
-  <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="b9b663145f20d703f85e79568ad1c1ca05c3a88d" upstream="master"/>
   <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="184b341e4a6dca0b31d90e38c76ec7425a68f4ae" upstream="lsk-4.4-armlt"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="5ad54b661fb30bad6667c62daf2ba929805ff127" upstream="master"/>
   <project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="b57c098ca0561ff39aa70b3fe2c795b7a0108717" upstream="master"/>
@@ -22,5 +20,7 @@
   <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="1df4046bd729e866743454a18a71e72228e585fd" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="702609a7a5ff8c05ab54bc967d762f1acf18fd9d" upstream="master"/>
+  <project name="tianocore/edk2" path="uefi/edk2" remote="github" revision="401d1343cb0279908a748fd0ff27609ccc300b43" upstream="master"/>
   <project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="bb3cae00ef4f726b89972f3b1470ed1a9e802806" upstream="master"/>
+  <project name="uefi/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="470ab22d9ef4cd30459f234b14665bfe0b2287ed" upstream="master"/>
 </manifest>
diff --git a/pinned-uefi.xml b/pinned-uefi.xml
index 04445d5..282d7bb 100644
--- a/pinned-uefi.xml
+++ b/pinned-uefi.xml
@@ -9,13 +9,13 @@
   <project name="acpica/acpica" path="tools/acpica" remote="github" revision="d0126a368a1f712d1d4bf723cd9be663aba88e08" upstream="master"/>
   <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="9978f0aac9febf8092f716835016f529f7321f7c" upstream="juno"/>
   <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="d9e8f81e7beeeeb0ffade64dc0b689e4fa11909e" upstream="vexpress"/>
-  <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="c06a2ef314cf8f2a1d5814ef16937c64f83b34bc" upstream="master"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="f8226efcee0cb0ae3388147e1ed86638b288488a" upstream="armlt"/>
-  <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="b9b663145f20d703f85e79568ad1c1ca05c3a88d" upstream="master"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="5ad54b661fb30bad6667c62daf2ba929805ff127" 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="1df4046bd729e866743454a18a71e72228e585fd" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="702609a7a5ff8c05ab54bc967d762f1acf18fd9d" upstream="master"/>
+  <project name="tianocore/edk2" path="uefi/edk2" remote="github" revision="401d1343cb0279908a748fd0ff27609ccc300b43" upstream="master"/>
   <project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="bb3cae00ef4f726b89972f3b1470ed1a9e802806" upstream="master"/>
+  <project name="uefi/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="470ab22d9ef4cd30459f234b14665bfe0b2287ed" upstream="master"/>
 </manifest>
diff --git a/uefi.xml b/uefi.xml
index 7f26166..92665fb 100644
--- a/uefi.xml
+++ b/uefi.xml
@@ -9,13 +9,13 @@
   <project name="acpica/acpica" path="tools/acpica" remote="github" revision="d0126a368a1f712d1d4bf723cd9be663aba88e08" upstream="master"/>
   <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="juno" upstream="juno"/>
   <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
-  <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="armlt" upstream="armlt"/>
-  <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="master" 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="365657667f8968f40237480169fea44fa3fb9949" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="3a43adc1730efa06bcd96e72b3a2c11ccd0091a4" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="28fcee179fc908ee2001a135179366d794af7878" upstream="master"/>
+  <project name="tianocore/edk2" path="uefi/edk2" remote="github" revision="master" upstream="master"/>
   <project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="master" upstream="master"/>
+  <project name="uefi/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
 </manifest>