18.01 manifest update

- Latest kernel moved to 4.14
- Recovery bundle updated with SCP v1.26-rc1
- Move to using edk2-platforms
- Build scripts updated for edk2-platforms
- ACK kernel 4.9 updated with bug fixes

Signed-off-by: Arvind Chauhan <arvind.chauhan@arm.com>

6 files changed, 26 insertions, 32 deletions

diff --git a/ack.xml b/ack.xml
index 92e3b35..e5b262c 100644
--- a/ack.xml
+++ b/ack.xml
@@ -18,9 +18,8 @@
   <project name="landing-teams/working/arm/u-boot" path="u-boot" 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="tianocore/edk2-platforms" path="uefi/edk2/edk2-platforms" 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/latest.xml b/latest.xml
index ee6f1f1..5d0b3d7 100644
--- a/latest.xml
+++ b/latest.xml
@@ -18,9 +18,8 @@
   <project name="landing-teams/working/arm/u-boot" path="u-boot" 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="tianocore/edk2-platforms" path="uefi/edk2/edk2-platforms" 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-ack.xml b/pinned-ack.xml
index a16d8dc..742e513 100644
--- a/pinned-ack.xml
+++ b/pinned-ack.xml
@@ -6,21 +6,20 @@
   <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="3b39efa49d9949c80b6e76b99829f84619b46110" upstream="master"/>
+  <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="c1edcd935deabaa1b7d28c5c56e4674c05b635f2" upstream="master"/>
   <project name="acpica/acpica" path="tools/acpica" remote="github" revision="d0126a368a1f712d1d4bf723cd9be663aba88e08" upstream="master"/>
-  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="cd9683ba1cee43e3d2b4486aeb8321f1d5fe12cf" upstream="juno"/>
+  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="c0290aff3c96f7766cf0c92f791f75247d0a12ec" 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/build-scripts" path="build-scripts" remote="linaro" revision="80ce29881c564c934194e9798ea721e1c4dc8501" upstream="armlt"/>
-  <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="da4440b88e736d43ec574438a09cd19f6c18ee02" upstream="ack-4.9-armlt"/>
+  <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="2750795e13c9c8fec89698ad3f637a1e876a069a" upstream="armlt"/>
+  <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="98a21b7733b037f2e9bfa437ead86be3196d9681" upstream="ack-4.9-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"/>
   <project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="a624e22f083eb0af7ed868f8bdbcd198c17588ca" 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/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="470ab22d9ef4cd30459f234b14665bfe0b2287ed" upstream="master"/>
+  <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="73b4e490a8ed0b4a7714818e80998b9d8a7da958" upstream="master"/>
+  <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="6d57389f9eec0c213da917e35861a8eca4b205b3" upstream="master"/>
+  <project name="tianocore/edk2" path="uefi/edk2" remote="github" revision="b23276135a51d9d9e9973f30ff6c5014a79d5177" upstream="master"/>
+  <project name="tianocore/edk2-platforms" path="uefi/edk2/edk2-platforms" remote="github" revision="cf8aef9c9684fec4bdc6b8356ee89e59822eab99" upstream="master"/>
   <project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="bb3cae00ef4f726b89972f3b1470ed1a9e802806" upstream="master"/>
 </manifest>
diff --git a/pinned-latest.xml b/pinned-latest.xml
index 1f5b1bc..33bff5d 100644
--- a/pinned-latest.xml
+++ b/pinned-latest.xml
@@ -6,21 +6,20 @@
   <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="3b39efa49d9949c80b6e76b99829f84619b46110" upstream="master"/>
+  <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="c1edcd935deabaa1b7d28c5c56e4674c05b635f2" upstream="master"/>
   <project name="acpica/acpica" path="tools/acpica" remote="github" revision="d0126a368a1f712d1d4bf723cd9be663aba88e08" upstream="master"/>
-  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="cd9683ba1cee43e3d2b4486aeb8321f1d5fe12cf" upstream="juno"/>
+  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="c0290aff3c96f7766cf0c92f791f75247d0a12ec" 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/build-scripts" path="build-scripts" remote="linaro" revision="80ce29881c564c934194e9798ea721e1c4dc8501" upstream="armlt"/>
-  <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="bc9dfc35c45566354696ac7a4c0469f9c570a945" upstream="latest-armlt"/>
+  <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="2750795e13c9c8fec89698ad3f637a1e876a069a" upstream="armlt"/>
+  <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="a77054ceba628f5963d3c89914aa3dc995f5ff64" upstream="latest-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"/>
   <project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="a624e22f083eb0af7ed868f8bdbcd198c17588ca" 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/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="470ab22d9ef4cd30459f234b14665bfe0b2287ed" upstream="master"/>
+  <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="73b4e490a8ed0b4a7714818e80998b9d8a7da958" upstream="master"/>
+  <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="6d57389f9eec0c213da917e35861a8eca4b205b3" upstream="master"/>
+  <project name="tianocore/edk2" path="uefi/edk2" remote="github" revision="b23276135a51d9d9e9973f30ff6c5014a79d5177" upstream="master"/>
+  <project name="tianocore/edk2-platforms" path="uefi/edk2/edk2-platforms" remote="github" revision="cf8aef9c9684fec4bdc6b8356ee89e59822eab99" upstream="master"/>
   <project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="bb3cae00ef4f726b89972f3b1470ed1a9e802806" upstream="master"/>
 </manifest>
diff --git a/pinned-uefi.xml b/pinned-uefi.xml
index dcc7ee3..411850e 100644
--- a/pinned-uefi.xml
+++ b/pinned-uefi.xml
@@ -5,17 +5,16 @@
   <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="3b39efa49d9949c80b6e76b99829f84619b46110" upstream="master"/>
+  <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="c1edcd935deabaa1b7d28c5c56e4674c05b635f2" upstream="master"/>
   <project name="acpica/acpica" path="tools/acpica" remote="github" revision="d0126a368a1f712d1d4bf723cd9be663aba88e08" upstream="master"/>
-  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="cd9683ba1cee43e3d2b4486aeb8321f1d5fe12cf" upstream="juno"/>
+  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="c0290aff3c96f7766cf0c92f791f75247d0a12ec" upstream="juno"/>
   <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="d9e8f81e7beeeeb0ffade64dc0b689e4fa11909e" upstream="vexpress"/>
-  <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="80ce29881c564c934194e9798ea721e1c4dc8501" upstream="armlt"/>
+  <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="2750795e13c9c8fec89698ad3f637a1e876a069a" upstream="armlt"/>
   <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/OpenPlatformPkg" path="uefi/edk2/OpenPlatformPkg" remote="linaro" revision="470ab22d9ef4cd30459f234b14665bfe0b2287ed" upstream="master"/>
+  <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="73b4e490a8ed0b4a7714818e80998b9d8a7da958" upstream="master"/>
+  <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="6d57389f9eec0c213da917e35861a8eca4b205b3" upstream="master"/>
+  <project name="tianocore/edk2" path="uefi/edk2" remote="github" revision="b23276135a51d9d9e9973f30ff6c5014a79d5177" upstream="master"/>
+  <project name="tianocore/edk2-platforms" path="uefi/edk2/edk2-platforms" remote="github" revision="cf8aef9c9684fec4bdc6b8356ee89e59822eab99" upstream="master"/>
   <project name="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="bb3cae00ef4f726b89972f3b1470ed1a9e802806" upstream="master"/>
 </manifest>
diff --git a/uefi.xml b/uefi.xml
index 62bfcc4..70e22ec 100644
--- a/uefi.xml
+++ b/uefi.xml
@@ -13,9 +13,8 @@
   <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="tianocore/edk2-platforms" path="uefi/edk2/edk2-platforms" 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>