refinfra: update sgi and rd platform manifests for 20q2 rddaniel releaseRD-INFRA-2020.04.16

Update the SGI and RD platform manifests for the RD-Daniel 2020.04.16
release. With patches for all platforms merged on a consolidated
branch for all components (except for SCP of RD-E1-Edge), the unused
manifests are deleted here as well.

Change-Id: If2b449e59c3fd85c5a6efcf53e8e93ca7efe5be5
Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>

12 files changed, 49 insertions, 172 deletions

diff --git a/pinned-rddaniel.xml b/pinned-rddaniel.xml
index b574697..1f1283f 100644
--- a/pinned-rddaniel.xml
+++ b/pinned-rddaniel.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="git://git.busybox.net/" name="busybox"/>
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
   <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
 
-  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refs/tags/RD-DANIEL-CFGM-2019.12.13"/>
-  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refs/tags/RD-INFRA-2019.12.17"/>
-  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refs/tags/RD-INFRA-2019.12.16"/>
-  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refs/tags/RD-INFRA-20191024-RC0"/>
+  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refs/tags/RD-INFRA-2020.04.16"/>
 
-  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R05_31_17"/>
-  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.2.1"/>
-  <project remote="github" name="ARM-software/CMSIS_5.git" path="scp/cmsis" revision="refs/tags/5.2.0"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_0"/>
+  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R03_26_20"/>
+  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.21.0"/>
+  <project remote="github" name="mirror/busybox" path="busybox" revision="refs/tags/1_31_1"/>
   <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
   <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
 </manifest>
diff --git a/pinned-rddanielx4.xml b/pinned-rddanielx4.xml
deleted file mode 100644
index 1e8b089..0000000
--- a/pinned-rddanielx4.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch="git://git.busybox.net/" name="busybox"/>
-  <remote fetch="https://github.com/" name="github"/>
-  <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
-  <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
-
-  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refs/tags/RD-INFRA-MC-2019.12.13"/>
-  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refs/tags/RD-INFRA-MC-2019.12.13"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refs/tags/RD-INFRA-2019.12.13"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refs/tags/RD-INFRA-MC-2019.12.13"/>
-  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refs/tags/RD-INFRA-2019.12.13"/>
-  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refs/tags/RD-INFRA-2019.12.17"/>
-  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refs/tags/RD-INFRA-2019.12.13"/>
-  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refs/tags/RD-INFRA-2019.12.13"/>
-
-  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R05_31_17"/>
-  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.2.1"/>
-  <project remote="github" name="ARM-software/CMSIS_5.git" path="scp/cmsis" revision="refs/tags/5.2.0"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_0"/>
-  <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
-  <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
-</manifest>
diff --git a/pinned-rde1edge.xml b/pinned-rde1edge.xml
index 04cb51f..661f549 100644
--- a/pinned-rde1edge.xml
+++ b/pinned-rde1edge.xml
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="git://git.busybox.net/" name="busybox"/>
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
   <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
   <remote fetch="https://git.kernel.org" name="kernel"/>
 
-  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refs/tags/RD-N1E1-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refs/tags/RD-INFRA-20191024-RC0"/>
+  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refs/tags/RD-E1EDGE-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refs/tags/RD-INFRA-2020.04.16"/>
 
-  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R05_31_17"/>
-  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.2.1"/>
-  <project remote="github" name="ARM-software/CMSIS_5.git" path="scp/cmsis" revision="refs/tags/5.2.0"/>
+  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R03_26_20"/>
+  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.21.0"/>
   <project remote="github" name="ARM-software/arm-enterprise-acs" path="validation/sys-test/arm-enterprise-acs" revision="refs/tags/v18.12_REL1.7"/>
   <project remote="kernel" name="pub/scm/linux/kernel/git/jejb/efitools" path="tools/efitools" revision="refs/tags/v1.9.2"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_0"/>
+  <project remote="github" name="mirror/busybox" path="busybox" revision="refs/tags/1_31_1"/>
   <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
   <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
 </manifest>
diff --git a/pinned-rdn1edge.xml b/pinned-rdn1edge.xml
index c1b98ff..9bf96a7 100644
--- a/pinned-rdn1edge.xml
+++ b/pinned-rdn1edge.xml
@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="git://git.busybox.net/" name="busybox"/>
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
   <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
   <remote fetch="https://git.kernel.org" name="kernel"/>
   <remote fetch="https://git.trustedfirmware.org" name="trustedfirmware"/>
 
-  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refs/tags/RD-N1E1-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="trustedfirmware" name="TF-A/tf-a-tests" path="validation/comp-test/trusted-firmware-tf" revision="refs/tags/v2.2"/>
+  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refs/tags/RD-INFRA-2020.04.16"/>
 
-  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R05_31_17"/>
-  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.2.1"/>
-  <project remote="github" name="ARM-software/CMSIS_5.git" path="scp/cmsis" revision="refs/tags/5.2.0"/>
+  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R03_26_20"/>
+  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.21.0"/>
   <project remote="github" name="ARM-software/arm-enterprise-acs" path="validation/sys-test/arm-enterprise-acs" revision="refs/tags/v18.12_REL1.7"/>
   <project remote="kernel" name="pub/scm/linux/kernel/git/jejb/efitools" path="tools/efitools" revision="refs/tags/v1.9.2"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_0"/>
+  <project remote="github" name="mirror/busybox" path="busybox" revision="refs/tags/1_31_1"/>
   <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
   <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
 </manifest>
diff --git a/pinned-rdn1edgex2.xml b/pinned-rdn1edgex2.xml
deleted file mode 100644
index 8f71948..0000000
--- a/pinned-rdn1edgex2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch="git://git.busybox.net/" name="busybox"/>
-  <remote fetch="https://github.com/" name="github"/>
-  <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
-  <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
-
-  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refs/tags/RD-MC-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refs/tags/RD-INFRA-MC-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refs/tags/RD-INFRA-MC-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refs/tags/RD-INFRA-20191024-RC0"/>
-
-  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R05_31_17"/>
-  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.2.1"/>
-  <project remote="github" name="ARM-software/CMSIS_5.git" path="scp/cmsis" revision="refs/tags/5.2.0"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_0"/>
-  <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
-  <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
-</manifest>
diff --git a/pinned-sgi575.xml b/pinned-sgi575.xml
index 0171b48..9bf96a7 100644
--- a/pinned-sgi575.xml
+++ b/pinned-sgi575.xml
@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="git://git.busybox.net/" name="busybox"/>
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
   <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
   <remote fetch="https://git.kernel.org" name="kernel"/>
   <remote fetch="https://git.trustedfirmware.org" name="trustedfirmware"/>
 
-  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="5633a90deeca7f23bc6a45ba5990709acc8e595a"/>
-  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="6eb3e14a7e53f21dd934f19537cdfa83f08aed29"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="ddda7804e10629f82b81758fa30f9ae37ffbeabe"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="fa28823810916e7229e526e74168d4364cb28196"/>
-  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="bbe496e059a22ffdd031ec7f78e59d83de681225"/>
-  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="ea0f1ba5702096677d658788f39b066914e89562"/>
-  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="d0196d3df824ee243523c48cefa4583c1b907312"/>
-  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="d607c4ac9dc5db521cfed62dc8b1a08c45c83fc6"/>
-  <project remote="trustedfirmware" name="TF-A/tf-a-tests" path="validation/comp-test/trusted-firmware-tf" revision="1ca3102141319bd514c296ddc256f92e321780a2"/>
+  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refs/tags/RD-INFRA-2020.04.16"/>
+  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refs/tags/RD-INFRA-2020.04.16"/>
 
-  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R08_16_19"/>
-  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.16.3"/>
-  <project remote="github" name="ARM-software/CMSIS_5.git" path="scp/cmsis" revision="refs/tags/5.2.0"/>
+  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R03_26_20"/>
+  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.21.0"/>
   <project remote="github" name="ARM-software/arm-enterprise-acs" path="validation/sys-test/arm-enterprise-acs" revision="refs/tags/v18.12_REL1.7"/>
   <project remote="kernel" name="pub/scm/linux/kernel/git/jejb/efitools" path="tools/efitools" revision="refs/tags/v1.9.2"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_0"/>
+  <project remote="github" name="mirror/busybox" path="busybox" revision="refs/tags/1_31_1"/>
   <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
-  <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="b57c098ca0561ff39aa70b3fe2c795b7a0108717"/>
+  <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
 </manifest>
diff --git a/rddaniel.xml b/rddaniel.xml
index fbf4ddf..4a8fc1c 100644
--- a/rddaniel.xml
+++ b/rddaniel.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="https://github.com/mirror/" name="busybox"/>
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
   <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
-  <remote fetch="https://git.kernel.org" name="kernel"/>
 
   <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refinfra" upstream="refinfra"/>
   <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refinfra" upstream="refinfra"/>
@@ -18,7 +15,7 @@
 
   <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R03_26_20"/>
   <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.21.0"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_1"/>
+  <project remote="github" name="mirror/busybox" path="busybox" revision="refs/tags/1_31_1"/>
   <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
   <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
 </manifest>
diff --git a/rddanielx4.xml b/rddanielx4.xml
deleted file mode 100644
index b5b29e0..0000000
--- a/rddanielx4.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch="git://git.busybox.net/" name="busybox"/>
-  <remote fetch="https://github.com/" name="github"/>
-  <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
-  <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
-
-  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refinfra-mc" upstream="refinfra-mc"/>
-  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refinfra-mc" upstream="refinfra-mc"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refinfra" upstream="refinfra"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refinfra-mc" upstream="refinfra-mc"/>
-  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refinfra" upstream="refinfra"/>
-  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refinfra" upstream="refinfra"/>
-  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refinfra" upstream="refinfra"/>
-  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refinfra" upstream="refinfra"/>
-
-  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="master" upstream="master"/>
-  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="master" upstream="master"/>
-  <project remote="github" name="ARM-software/CMSIS_5.git" path="scp/cmsis" revision="refs/tags/5.2.0"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="master" upstream="master"/>
-  <project remote="gnugit" name="git/grub" path="grub" revision="master" upstream="master"/>
-  <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="master" upstream="master"/>
-</manifest>
diff --git a/rde1edge.xml b/rde1edge.xml
index 46e4c81..64cd76a 100644
--- a/rde1edge.xml
+++ b/rde1edge.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="https://github.com/mirror/" name="busybox"/>
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
   <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
   <remote fetch="https://git.kernel.org" name="kernel"/>
-  <remote fetch="https://git.trustedfirmware.org" name="trustedfirmware"/>
 
   <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refinfra-rde1edge" upstream="refinfra"/>
   <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refinfra" upstream="refinfra"/>
@@ -16,13 +13,12 @@
   <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refinfra" upstream="refinfra"/>
   <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refinfra" upstream="refinfra"/>
   <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refinfra" upstream="refinfra"/>
-  <project remote="trustedfirmware" name="TF-A/tf-a-tests" path="validation/comp-test/trusted-firmware-tf" revision="master" upstream="master"/>
 
   <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R03_26_20"/>
   <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.21.0"/>
   <project remote="github" name="ARM-software/arm-enterprise-acs" path="validation/sys-test/arm-enterprise-acs" revision="refs/tags/v18.12_REL1.7"/>
   <project remote="kernel" name="pub/scm/linux/kernel/git/jejb/efitools" path="tools/efitools" revision="refs/tags/v1.9.2"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_1"/>
+  <project remote="github" name="mirror/busybox" path="busybox" revision="refs/tags/1_31_1"/>
   <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
   <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
 </manifest>
diff --git a/rdn1edge.xml b/rdn1edge.xml
index 90997ef..3418bea 100644
--- a/rdn1edge.xml
+++ b/rdn1edge.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="https://github.com/mirror/" name="busybox"/>
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
   <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
   <remote fetch="https://git.kernel.org" name="kernel"/>
   <remote fetch="https://git.trustedfirmware.org" name="trustedfirmware"/>
@@ -16,13 +14,12 @@
   <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refinfra" upstream="refinfra"/>
   <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refinfra" upstream="refinfra"/>
   <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refinfra" upstream="refinfra"/>
-  <project remote="trustedfirmware" name="TF-A/tf-a-tests" path="validation/comp-test/trusted-firmware-tf" revision="master" upstream="master"/>
 
   <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R03_26_20"/>
   <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.21.0"/>
   <project remote="github" name="ARM-software/arm-enterprise-acs" path="validation/sys-test/arm-enterprise-acs" revision="refs/tags/v18.12_REL1.7"/>
   <project remote="kernel" name="pub/scm/linux/kernel/git/jejb/efitools" path="tools/efitools" revision="refs/tags/v1.9.2"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_1"/>
+  <project remote="github" name="mirror/busybox" path="busybox" revision="refs/tags/1_31_1"/>
   <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
   <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
 </manifest>
diff --git a/rdn1edgex2.xml b/rdn1edgex2.xml
deleted file mode 100644
index b5b29e0..0000000
--- a/rdn1edgex2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch="git://git.busybox.net/" name="busybox"/>
-  <remote fetch="https://github.com/" name="github"/>
-  <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
-  <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
-
-  <project remote="linaro" name="landing-teams/working/arm/scp-firmware" path="scp" revision="refinfra-mc" upstream="refinfra-mc"/>
-  <project remote="linaro" name="landing-teams/working/arm/arm-tf" path="arm-tf" revision="refinfra-mc" upstream="refinfra-mc"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2" path="uefi/edk2" revision="refinfra" upstream="refinfra"/>
-  <project remote="linaro" name="landing-teams/working/arm/edk2-platforms" path="uefi/edk2/edk2-platforms" revision="refinfra-mc" upstream="refinfra-mc"/>
-  <project remote="linaro" name="landing-teams/working/arm/kernel-release" path="linux" revision="refinfra" upstream="refinfra"/>
-  <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refinfra" upstream="refinfra"/>
-  <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refinfra" upstream="refinfra"/>
-  <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refinfra" upstream="refinfra"/>
-
-  <project remote="github" name="acpica/acpica" path="tools/acpica" revision="master" upstream="master"/>
-  <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="master" upstream="master"/>
-  <project remote="github" name="ARM-software/CMSIS_5.git" path="scp/cmsis" revision="refs/tags/5.2.0"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="master" upstream="master"/>
-  <project remote="gnugit" name="git/grub" path="grub" revision="master" upstream="master"/>
-  <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="master" upstream="master"/>
-</manifest>
diff --git a/sgi575.xml b/sgi575.xml
index 90997ef..3418bea 100644
--- a/sgi575.xml
+++ b/sgi575.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="https://github.com/mirror/" name="busybox"/>
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
-  <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
   <remote fetch="https://git.savannah.gnu.org" name="gnugit"/>
   <remote fetch="https://git.kernel.org" name="kernel"/>
   <remote fetch="https://git.trustedfirmware.org" name="trustedfirmware"/>
@@ -16,13 +14,12 @@
   <project remote="linaro" name="landing-teams/working/arm/build-scripts" path="build-scripts" revision="refinfra" upstream="refinfra"/>
   <project remote="linaro" name="landing-teams/working/arm/model-scripts" path="model-scripts" revision="refinfra" upstream="refinfra"/>
   <project remote="linaro" name="landing-teams/working/arm/uefi-tools" path="tools/uefi-tools" revision="refinfra" upstream="refinfra"/>
-  <project remote="trustedfirmware" name="TF-A/tf-a-tests" path="validation/comp-test/trusted-firmware-tf" revision="master" upstream="master"/>
 
   <project remote="github" name="acpica/acpica" path="tools/acpica" revision="refs/tags/R03_26_20"/>
   <project remote="github" name="ARMmbed/mbedtls.git" path="mbedtls" revision="refs/tags/mbedtls-2.21.0"/>
   <project remote="github" name="ARM-software/arm-enterprise-acs" path="validation/sys-test/arm-enterprise-acs" revision="refs/tags/v18.12_REL1.7"/>
   <project remote="kernel" name="pub/scm/linux/kernel/git/jejb/efitools" path="tools/efitools" revision="refs/tags/v1.9.2"/>
-  <project remote="busybox" name="busybox" path="busybox" revision="refs/tags/1_31_1"/>
+  <project remote="github" name="mirror/busybox" path="busybox" revision="refs/tags/1_31_1"/>
   <project remote="gnugit" name="git/grub" path="grub" revision="refs/tags/grub-2.04"/>
   <project remote="linaro" name="landing-teams/working/arm/ramdisk" path="ramdisk" revision="refs/tags/armlt-20180812-001"/>
 </manifest>