summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--latest.xml28
-rw-r--r--lsk.xml28
-rw-r--r--uefi.xml16
3 files changed, 36 insertions, 36 deletions
diff --git a/latest.xml b/latest.xml
index fe0bed3..0c17396 100644
--- a/latest.xml
+++ b/latest.xml
@@ -7,22 +7,22 @@
<remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
<remote fetch="https://github.com/OP-TEE/" name="optee"/>
- <project path="arm-tf" name="ARM-software/arm-trusted-firmware" remote="github" revision="master"/>
- <project path="build-scripts" name="landing-teams/working/arm/build-scripts" remote="linaro" revision="master"/>
- <project path="model-scripts" name="landing-teams/working/arm/model-scripts" remote="linaro" revision="master"/>
- <project path="u-boot" name="landing-teams/working/arm/u-boot" remote="linaro" revision="master"/>
- <project path="uefi/edk2" name="landing-teams/working/arm/edk2" remote="linaro" revision="master"/>
- <project path="uefi/OpenPlatformPkg" name="landing-teams/working/arm/OpenPlatformPkg" remote="linaro" revision="master"/>
- <project path="uefi/uefi-tools" name="landing-teams/working/arm/uefi-tools.git" remote="linaro" revision="master"/>
- <project path="linux" name="landing-teams/working/arm/kernel-release" remote="linaro" revision="latest-armlt"/>
- <project path="recovery" name="arm/vexpress-firmware" remote="linaro" revision="junor1"/>
- <project path="vexpress-firmware" name="arm/vexpress-firmware" remote="linaro" revision="vexpress"/>
- <project path="ramdisk" name="landing-teams/working/arm/ramdisk" remote="linaro" revision="master"/>
- <project path="busybox" name="busybox" remote="busybox" revision="master"/>
- <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master"/>
+ <project path="arm-tf" name="ARM-software/arm-trusted-firmware" remote="github" revision="master" upstream="master"/>
+ <project path="build-scripts" name="landing-teams/working/arm/build-scripts" remote="linaro" revision="master" upstream="master"/>
+ <project path="model-scripts" name="landing-teams/working/arm/model-scripts" remote="linaro" revision="master" upstream="master"/>
+ <project path="u-boot" name="landing-teams/working/arm/u-boot" remote="linaro" revision="master" upstream="master"/>
+ <project path="uefi/edk2" name="landing-teams/working/arm/edk2" remote="linaro" revision="master" upstream="master"/>
+ <project path="uefi/OpenPlatformPkg" name="landing-teams/working/arm/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
+ <project path="uefi/uefi-tools" name="landing-teams/working/arm/uefi-tools.git" remote="linaro" revision="master" upstream="master"/>
+ <project path="linux" name="landing-teams/working/arm/kernel-release" remote="linaro" revision="latest-armlt" upstream="latest-armlt"/>
+ <project path="recovery" name="arm/vexpress-firmware" remote="linaro" revision="junor1" upstream="junor1"/>
+ <project path="vexpress-firmware" name="arm/vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
+ <project path="ramdisk" name="landing-teams/working/arm/ramdisk" remote="linaro" revision="master" upstream="master"/>
+ <project path="busybox" name="busybox" remote="busybox" revision="master" upstream="master"/>
+ <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master" upstream="master"/>
<project name="optee_os.git" path="optee/optee_os" remote="optee" revision="master" upstream="master"/>
<project name="optee_client.git" path="optee/optee_client" remote="optee" revision="master" upstream="master"/>
<project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="master" upstream="master"/>
- <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60"/>
+ <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
</manifest>
diff --git a/lsk.xml b/lsk.xml
index f96b03c..f28d350 100644
--- a/lsk.xml
+++ b/lsk.xml
@@ -7,22 +7,22 @@
<remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
<remote fetch="https://github.com/OP-TEE/" name="optee"/>
- <project path="arm-tf" name="ARM-software/arm-trusted-firmware" remote="github" revision="master"/>
- <project path="build-scripts" name="landing-teams/working/arm/build-scripts" remote="linaro" revision="master"/>
- <project path="model-scripts" name="landing-teams/working/arm/model-scripts" remote="linaro" revision="master"/>
- <project path="u-boot" name="landing-teams/working/arm/u-boot" remote="linaro" revision="master"/>
- <project path="uefi/edk2" name="landing-teams/working/arm/edk2" remote="linaro" revision="master"/>
- <project path="uefi/OpenPlatformPkg" name="landing-teams/working/arm/OpenPlatformPkg" remote="linaro" revision="master"/>
- <project path="uefi/uefi-tools" name="landing-teams/working/arm/uefi-tools.git" remote="linaro" revision="master"/>
- <project path="linux" name="landing-teams/working/arm/kernel-release" remote="linaro" revision="lsk-3.18-armlt"/>
- <project path="recovery" name="arm/vexpress-firmware" remote="linaro" revision="junor1"/>
- <project path="vexpress-firmware" name="arm/vexpress-firmware" remote="linaro" revision="vexpress"/>
- <project path="ramdisk" name="landing-teams/working/arm/ramdisk" remote="linaro" revision="master"/>
- <project path="busybox" name="busybox" remote="busybox" revision="master"/>
- <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master"/>
+ <project path="arm-tf" name="ARM-software/arm-trusted-firmware" remote="github" revision="master" upstream="master"/>
+ <project path="build-scripts" name="landing-teams/working/arm/build-scripts" remote="linaro" revision="master" upstream="master"/>
+ <project path="model-scripts" name="landing-teams/working/arm/model-scripts" remote="linaro" revision="master" upstream="master"/>
+ <project path="u-boot" name="landing-teams/working/arm/u-boot" remote="linaro" revision="master" upstream="master"/>
+ <project path="uefi/edk2" name="landing-teams/working/arm/edk2" remote="linaro" revision="master" upstream="master"/>
+ <project path="uefi/OpenPlatformPkg" name="landing-teams/working/arm/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
+ <project path="uefi/uefi-tools" name="landing-teams/working/arm/uefi-tools.git" remote="linaro" revision="master" upstream="master"/>
+ <project path="linux" name="landing-teams/working/arm/kernel-release" remote="linaro" revision="lsk-3.18-armlt" upstream="lsk-3.18-armlt"/>
+ <project path="recovery" name="arm/vexpress-firmware" remote="linaro" revision="junor1" upstream="junor1"/>
+ <project path="vexpress-firmware" name="arm/vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
+ <project path="ramdisk" name="landing-teams/working/arm/ramdisk" remote="linaro" revision="master" upstream="master"/>
+ <project path="busybox" name="busybox" remote="busybox" revision="master" upstream="master"/>
+ <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master" upstream="master"/>
<project name="optee_os.git" path="optee/optee_os" remote="optee" revision="master" upstream="master"/>
<project name="optee_client.git" path="optee/optee_client" remote="optee" revision="master" upstream="master"/>
<project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="master" upstream="master"/>
- <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60"/>
+ <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
</manifest>
diff --git a/uefi.xml b/uefi.xml
index 98a8f74..8f552c0 100644
--- a/uefi.xml
+++ b/uefi.xml
@@ -5,14 +5,14 @@
<remote fetch="https://git.linaro.org/" name="linaro"/>
<remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
- <project path="arm-tf" name="ARM-software/arm-trusted-firmware" remote="github" revision="master"/>
- <project path="build-scripts" name="landing-teams/working/arm/build-scripts" remote="linaro" revision="master"/>
- <project path="model-scripts" name="landing-teams/working/arm/model-scripts" remote="linaro" revision="master"/>
- <project path="uefi/edk2" name="landing-teams/working/arm/edk2" remote="linaro" revision="master"/>
- <project path="uefi/OpenPlatformPkg" name="landing-teams/working/arm/OpenPlatformPkg" remote="linaro" revision="master"/>
- <project path="uefi/uefi-tools" name="landing-teams/working/arm/uefi-tools.git" remote="linaro" revision="master"/>
- <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60"/>
+ <project path="arm-tf" name="ARM-software/arm-trusted-firmware" remote="github" revision="master" upstream="master"/>
+ <project path="build-scripts" name="landing-teams/working/arm/build-scripts" remote="linaro" revision="master" upstream="master"/>
+ <project path="model-scripts" name="landing-teams/working/arm/model-scripts" remote="linaro" revision="master" upstream="master"/>
+ <project path="uefi/edk2" name="landing-teams/working/arm/edk2" remote="linaro" revision="master" upstream="master"/>
+ <project path="uefi/OpenPlatformPkg" name="landing-teams/working/arm/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
+ <project path="uefi/uefi-tools" name="landing-teams/working/arm/uefi-tools.git" remote="linaro" revision="master" upstream="master"/>
+ <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
<project path="recovery" name="arm/vexpress-firmware" remote="linaro" revision="junor1"/>
<project path="vexpress-firmware" name="arm/vexpress-firmware" remote="linaro" revision="vexpress"/>
- <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master"/>
+ <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master" upstream="master"/>
</manifest>