diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-03-19 16:50:27 +0000 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-03-19 16:50:27 +0000 |
| commit | 330262b3ee4591dfa893d85836d6b37a11232c73 (patch) | |
| tree | caaf427ad4859b2c81c2ffcb248fd49e24a27bff | |
| parent | 5e36b28f24fff0bbfe166db6c009e3becd3edf81 (diff) | |
| parent | ca005b3f37969064273f10e5945916cc2773cfa1 (diff) | |
| download | manifest-linaro_android_5.0.0_lsk-3.14.tar.gz | |
Merge branch 'linaro_android_5.0.0' into linaro_android_5.0.0_lsk-3.14linaro_android_5.0.0_lsk-3.14
Conflicts:
linaro.xml
| -rw-r--r-- | linaro.xml | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/linaro.xml b/linaro.xml index e71c76da1..597bb39ee 100644 --- a/linaro.xml +++ b/linaro.xml @@ -4,15 +4,25 @@ <!-- Linaro Repositories --> <remote name="linaro-android" fetch="git://android.git.linaro.org/" review="review.android.git.linaro.org" /> <remote name="linaro-other" fetch="git://git.linaro.org/" /> + <remote name="git-ti-mirror" fetch="git://git.ti.com/" /> <!-- Linaro AddOn Projects --> <!-- Linaro Tests --> <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.21-master-20140515" remote="linaro-android"/> <project path="external/waffle" name="platform/external/waffle" revision="linaro-armv8" remote="linaro-android"/> <project path="external/piglit" name="platform/external/piglit" revision="linaro-armv8" remote="linaro-android"/> + <project path="external/powertop" name="platform/external/powertop-2.0" revision="android" groups="common" remote="linaro-android"/> + <project path="external/powerdebug" name="platform/external/powerdebug" revision="android" groups="common" remote="linaro-android"/> + <project path="external/ncurses" name="platform/external/ncurses" revision="linaro" groups="common" remote="linaro-android"/> + <project path="external/pm-qa" name="platform/external/pm-qa" revision="android" groups="common" remote="linaro-android"/> <project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" revision="linaro-juice-master-20140514" remote="linaro-android"/> <project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" revision="master" remote="linaro-android"/> + <project path="external/libc-bench" name="platform/external/libc-bench" revision="master" remote="linaro-android"/> + <project path="external/stringbench" name="platform/external/stringbench" revision="master" remote="linaro-android"/> + <project path="android-patchsets" name="android-patchsets" revision="master" remote="linaro-android"/> <!-- Linaro Device Configs --> + <project path="device/linaro/juno" name="android/device/linaro/juno" revision="linaro-lollipop" remote="linaro-android" groups="non-default,juno" /> + <project path="device/linaro/juno32" name="device/linaro/juno32" revision="linaro-lollipop" remote="linaro-android" groups="non-default,juno32" /> <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="linaro-lollipop-experimental"/> <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-lollipop" remote="linaro-android" groups="non-default,vexpress" /> <project path="device/linaro/fvp" name="device/linaro/fvp-armv8" revision="linaro-fvp-lollipop" remote="linaro-android" groups="non-default,fvp-armv8,vexpress" /> @@ -20,8 +30,17 @@ <!-- Linaro Kernels --> <project path="kernel/linaro/vexpress" name="kernel/linux-linaro-stable" revision="linux-linaro-lsk-v3.14-android" remote="linaro-other" groups="non-default,vexpress" /> + <project path="kernel/linaro/armv8" name="landing-teams/working/arm/kernel-release" revision="lsk-3.10-armlt-juno" remote="linaro-other" groups="non-default,juno,juno32,fvp-armv8" /> <!-- Linaro Bootloaders --> <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" groups="non-default,vexpress" /> - <project path="vexpress-firmware" name="arm/vexpress-firmware" revision="juno-recovery-tarball" remote="linaro-other" groups="non-default,juno" /> + <project path="vexpress-firmware" name="arm/vexpress-firmware" revision="juno-recovery-tarball" remote="linaro-other" groups="non-default,juno,juno32" /> + + <!-- TI Vayu board support --> + <project path="kernel/linaro/jacinto6evm" name="android-sdk/kernel-omap" revision="p-ti-linux-3.14.y-android" remote="git-ti-mirror" groups="device,ti" /> + <project path="device/ti/proprietary-open" name="android-sdk/device-ti-proprietary-open" remote="git-ti-mirror" revision="d-lollipop-release" groups="device,ti" /> + <project path="device/ti/common-open" name="android-sdk/device-ti-common-open" remote="git-ti-mirror" revision="d-lollipop-release" groups="device,ti" /> + <project path="device/ti/jacinto6evm" name="android-sdk/device-ti-jacinto6evm" remote="git-ti-mirror" revision="d-lollipop-release" groups="device,ti" /> + <project path="hardware/ti/dra7xx" name="android-sdk/platform-hardware-ti-dra7xx" remote="git-ti-mirror" revision="d-lollipop-release" groups="device,ti" /> + <project path="external/libdrm" name="android-sdk/libdrm" remote="git-ti-mirror" revision="master" groups="ti" /> </manifest> |