summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--staging-galaxynexus.xml2
-rw-r--r--staging-vexpress-tc2-isw.xml4
-rw-r--r--tracking.xml15
3 files changed, 14 insertions, 7 deletions
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index b571c0b..eb99549 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -50,7 +50,7 @@
<!-- project path="kernel" name="kernel/linaro-android" revision="linaro-android-3.2-agreen-rebase" remote="aosp" / -->
<!-- AOSP kernel -->
<!-- Kernel builds usually come from the android-omap-tuna-3.0 branch, but AOSP always specifies the exact revision -->
- <project path="kernel" name="kernel/omap" revision="d5a18e013da25a07b330fd70c212ac477cabff4e" />
+ <project path="kernel" name="kernel/omap" revision="android-omap-tuna-3.0-jb-mr1.1" />
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK -->
diff --git a/staging-vexpress-tc2-isw.xml b/staging-vexpress-tc2-isw.xml
index f4177ce..7452896 100644
--- a/staging-vexpress-tc2-isw.xml
+++ b/staging-vexpress-tc2-isw.xml
@@ -37,12 +37,12 @@
<project path="external/busybox" name="platform/external/busybox" revision="linaro-1.21" />
<project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" />
<project path="external/x264" name="platform/external/x264" revision="linaro-master" />
- <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-1.0.1" />
+ <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.11.1" />
<project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
<project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro-jb" />
<project path="u-boot" name="people/bhoj/u-boot-linaro-stable" revision="master" remote="linaro-other" />
<project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" />
- <project path="test/linaro/biglittle/core" name="bL_tests/core-tests" revision="master" remote="linaro-private"/>
+ <project path="test/linaro/biglittle/core" name="bL_tests/bL_iks_tests" revision="master" remote="linaro-private"/>
<project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
<project path="external/pm-qa" name="tools/pm-qa" revision="linaro-2013.01" remote="linaro-other" />
<project path="external/tools_for_pm-qa" name="people/kejunzhou/tools_for_pm-qa" remote="linaro-other" revision="master"/>
diff --git a/tracking.xml b/tracking.xml
index 51f1230..506734b 100644
--- a/tracking.xml
+++ b/tracking.xml
@@ -8,6 +8,8 @@
fetch="https://android-review.googlesource.com/" />
<remote name="linaro-other"
fetch="git://git.linaro.org/" />
+ <remote name="linaro-private"
+ fetch="ssh://linaro-big-little-switcher-bot@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
<default revision="refs/tags/android-4.2.2_r1"
@@ -35,12 +37,14 @@
<project path="external/busybox" name="platform/external/busybox" revision="linaro-1.21" groups="common" />
<project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" groups="common" />
<project path="external/x264" name="platform/external/x264" revision="linaro-master" groups="common" />
- <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-1.0.1" groups="common" />
+ <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.11.1" groups="common" />
<project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" groups="common" />
<project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro-jb" groups="common" />
<project path="u-boot/linaro/origen" name="landing-teams/working/samsung/u-boot" revision="tracking" remote="linaro-other" groups="origen" />
<project path="u-boot/linaro/vexpress" name="people/tixy/u-boot" revision="vexpress-hacks" remote="linaro-other" groups="vexpress" />
- <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" groups="vexpress" />
+ <project path="u-boot/linaro/vexpress-iks" name="people/bhoj/u-boot-linaro-stable" revision="master" remote="linaro-other" groups="vexpress-iks" />
+ <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" groups="vexpress,vexpress-iks" />
+ <project path="test/linaro/biglittle/core" name="bL_tests/bL_iks_tests" revision="master" remote="linaro-private" groups="vexpress-iks" />
<project path="boot-wrapper" name="arm/models/boot-wrapper" revision="master" remote="linaro-other" groups="vexpress" />
<project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" groups="common" />
@@ -54,12 +58,15 @@
<project path="external/stress" name="platform/external/stress" revision="linaro_android" groups="common" />
<project path="external/stressapptest" name="platform/external/stressapptest" revision="linaro_android" groups="common" />
<project path="external/htop" name="platform/external/htop" revision="linaro_android" groups="common" />
- <project path="external/cyclictest" name="platform/external/cyclictest" revision="linaro_android" groups="vexpress"/>
- <project path="external/sysbench" name="platform/external/sysbench" revision="linaro_android" groups="vexpress"/>
+ <project path="external/cyclictest" name="platform/external/cyclictest" revision="linaro_android" groups="vexpress,vexpress-iks" />
+ <project path="external/sysbench" name="platform/external/sysbench" revision="linaro_android" groups="vexpress,vexpress-iks" />
<project path="external/stringbench" name="platform/external/stringbench" revision="master" groups="common" />
+ <project path="test/linaro/biglittle/sched_tests" name="bL_tests/sched_tests" revision="master" remote="linaro-private" groups="vexpress-tests" />
+ <project path="test/linaro/biglittle/task-placement-tests" name="bL_tests/task-placement-tests" revision="master" remote="linaro-private" groups="vexpress-tests" />
<!-- Linaro kernels -->
<project path="kernel/linaro/origen" name="landing-teams/working/samsung/kernel" remote="linaro-other" revision="android-tracking" groups="origen" />
<project path="kernel/linaro/vexpress" name="kernel/linux-linaro-tracking" remote="linaro-other" revision="linux-linaro" groups="vexpress" />
+ <project path="kernel/linaro/vexpress-iks" name="bL_switcher/linux" revision="master" remote="linaro-private" groups="vexpress-iks" />
<!-- AOSP kernel -->
<!-- project path="kernel" name="kernel/omap" revision="android-omap-panda-3.0" -->
<!-- We copy the defconfig over so we can use the same name as w/ the Linaro kernel -->