summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArvind Chauhan <arvind.chauhan@arm.com>2017-11-08 16:15:50 +0000
committerArvind Chauhan <arvind.chauhan@arm.com>2017-11-08 16:15:50 +0000
commit6375a992ac9f36c4bcf646263f0936d9986e65a5 (patch)
treef58870edb5c75b99ed4b635c6ff41ae978ab880e
parent6dba9e32be024710968748a541abbb6e6da77984 (diff)
Revert "Update ARM-TF to ARMLT fork for SCMI"
This reverts commit f48db6d1a6d2920c22a252654eafd8a96efec740. Signed-off-by: Arvind Chauhan <arvind.chauhan@arm.com>
-rw-r--r--latest.xml2
-rw-r--r--lsk.xml2
-rw-r--r--pinned-latest.xml2
-rw-r--r--pinned-lsk.xml2
-rw-r--r--pinned-uefi.xml4
-rw-r--r--uefi.xml2
6 files changed, 7 insertions, 7 deletions
diff --git a/latest.xml b/latest.xml
index 2919fc2..ee6f1f1 100644
--- a/latest.xml
+++ b/latest.xml
@@ -6,7 +6,7 @@
<remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
<remote fetch="https://github.com/OP-TEE/" name="optee"/>
- <project name="landing-teams/working/arm/arm-tf" path="arm-tf" remote="linaro" revision="master" upstream="master"/>
+ <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="master" 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="juno" upstream="juno"/>
<project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
diff --git a/lsk.xml b/lsk.xml
index ce978de..cd498ea 100644
--- a/lsk.xml
+++ b/lsk.xml
@@ -6,7 +6,7 @@
<remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
<remote fetch="https://github.com/OP-TEE/" name="optee"/>
- <project name="landing-teams/working/arm/arm-tf" path="arm-tf" remote="linaro" revision="master" upstream="master"/>
+ <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="master" 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="juno" upstream="juno"/>
<project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
diff --git a/pinned-latest.xml b/pinned-latest.xml
index 31a8893..230fd44 100644
--- a/pinned-latest.xml
+++ b/pinned-latest.xml
@@ -6,11 +6,11 @@
<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="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="vexpress-firmware" remote="linaro" revision="d9e8f81e7beeeeb0ffade64dc0b689e4fa11909e" upstream="vexpress"/>
<project name="busybox" remote="busybox" revision="111cdcf295b4cab78521480f52b295d9ae719263" upstream="master"/>
- <project name="landing-teams/working/arm/arm-tf" path="arm-tf" remote="linaro" revision="569b4abec93271722bfc51a95027eb0a9d3447c1" upstream="master"/>
<project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="72868d7f1b3cd5cec8e67125a5597545f61b83d1" 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/model-scripts" path="model-scripts" remote="linaro" revision="5ad54b661fb30bad6667c62daf2ba929805ff127" upstream="master"/>
diff --git a/pinned-lsk.xml b/pinned-lsk.xml
index 5fe8838..140f43e 100644
--- a/pinned-lsk.xml
+++ b/pinned-lsk.xml
@@ -6,11 +6,11 @@
<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="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="vexpress-firmware" remote="linaro" revision="d9e8f81e7beeeeb0ffade64dc0b689e4fa11909e" upstream="vexpress"/>
<project name="busybox" remote="busybox" revision="111cdcf295b4cab78521480f52b295d9ae719263" upstream="master"/>
- <project name="landing-teams/working/arm/arm-tf" path="arm-tf" remote="linaro" revision="569b4abec93271722bfc51a95027eb0a9d3447c1" upstream="master"/>
<project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="72868d7f1b3cd5cec8e67125a5597545f61b83d1" upstream="armlt"/>
<project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="d370796fcf675ad6433c5f6e19a6cf8292640f2e" upstream="lsk-4.4-armlt"/>
<project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="5ad54b661fb30bad6667c62daf2ba929805ff127" upstream="master"/>
diff --git a/pinned-uefi.xml b/pinned-uefi.xml
index 41f2f91..d8b5983 100644
--- a/pinned-uefi.xml
+++ b/pinned-uefi.xml
@@ -4,11 +4,11 @@
<remote fetch="https://git.linaro.org/" name="linaro"/>
<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="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="vexpress-firmware" remote="linaro" revision="d9e8f81e7beeeeb0ffade64dc0b689e4fa11909e" upstream="vexpress"/>
- <project name="landing-teams/working/arm/arm-tf" path="arm-tf" remote="linaro" revision="569b4abec93271722bfc51a95027eb0a9d3447c1" upstream="master"/>
<project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="72868d7f1b3cd5cec8e67125a5597545f61b83d1" 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"/>
diff --git a/uefi.xml b/uefi.xml
index 92665fb..62bfcc4 100644
--- a/uefi.xml
+++ b/uefi.xml
@@ -5,7 +5,7 @@
<remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
<remote fetch="https://github.com/OP-TEE/" name="optee"/>
- <project name="landing-teams/working/arm/arm-tf" path="arm-tf" remote="linaro" revision="master" upstream="master"/>
+ <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="master" 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="juno" upstream="juno"/>
<project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>