change to the same as kernel ci branchlinaro_android_4.2.2

1 files changed, 12 insertions, 9 deletions

diff --git a/default.xml b/default.xml
index 6a89b16..69a5e1c 100644
--- a/default.xml
+++ b/default.xml
@@ -2,7 +2,7 @@
 <manifest>
 
   <remote  name="aosp"
-           fetch="http://android.git.linaro.org/git-ro/"
+           fetch="git://android.git.linaro.org/"
            review="review.android.git.linaro.org" />
   <remote  name="aosp-upstream"
            fetch="https://android-review.googlesource.com/"
@@ -11,6 +11,8 @@
            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="linaro-landing-team-hisilicon"
+           fetch="ssh://linaro-landing-team-hisilicon-bot@hisilicon.git.linaro.org/landing-team/hisilicon/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
   <remote  name="igloocommunity"
@@ -20,7 +22,7 @@
            sync-j="4" />
 
   <!-- Linaro extras -->
-  <project path="device/linaro/common" name="people/yongqinliu/device/linaro/common" revision="linaro-jb" groups="common" remote="linaro-other" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro-jb" groups="common" />
   <project path="device/linaro/iMX53" name="device/linaro/imx53" revision="linaro-jb" groups="imx53" />
   <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro-jb" groups="common" />
   <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-jb" groups="common" />
@@ -29,21 +31,22 @@
   <project path="device/linaro/hi4511" name="device/linaro/hi4511" revision="linaro-jb" groups="common" />
   <project path="u-boot/linaro/arndale" name="landing-teams/working/samsung/u-boot" revision="tracking" remote="linaro-other" groups="arndale" />
   <project path="u-boot/linaro/u-boot-linaro-stable" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" groups="pandaboard" />
-  <project path="u-boot/linaro/snowball" name="people/axelfagerstedt/u-boot/linaro/snowball.git" revision="refs/tags/2013.02.2" remote="linaro-other" groups="snowball" />
-  <project path="u-boot/linaro/vexpress" name="people/tixy/u-boot" revision="vexpress-hacks" remote="linaro-other" groups="vexpress" />
+  <project path="u-boot/linaro/snowball" name="people/axelfagerstedt/u-boot/linaro/snowball.git" revision="20a79baeae9e167f2c3dd775700eca88ded8feee" remote="linaro-other" groups="snowball" />
+  <project path="u-boot/linaro/vexpress" name="people/tixy/u-boot" revision="vexpress-hacks" remote="linaro-other" groups="vexpress,vexpress-lsk" />
   <project path="u-boot/linaro/vexpress-iks" name="people/bhoj/u-boot-linaro-stable" revision="master" remote="linaro-other" groups="vexpress-iks" />
   <!-- Linaro kernels -->
   <project path="kernel/linaro/arndale" name="landing-teams/working/samsung/kernel" remote="linaro-other" revision="tracking-android-arndale" groups="arndale" />
   <project path="kernel/linaro/pandaboard" name="kernel/panda" revision="linaro-tilt-android-tracking" groups="pandaboard"/>
   <project path="kernel/linaro/snowball" name="git/kernel/igloo-kernel" revision="stable-android-ux500-3.4" remote="igloocommunity" groups="snowball" />
   <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" />
+  <project path="kernel/linaro/vexpress-iks" name="bL_switcher/linux" revision="IKS+reference" remote="linaro-private" groups="vexpress-iks" />
+  <project path="kernel/linaro/vexpress-lsk" name="kernel/linux-linaro-stable" revision="linux-linaro-lsk-android" remote="linaro-other" groups="vexpress-lsk" />
   <project path="kernel/linaro/iMX53" name="kernel/imx53" revision="lt-3.1-android" groups="imx53" />
-  <project path="kernel/linaro/hisilicon" name="people/bhoj/hisilicon" revision="integration-linux-mainline" remote="linaro-other" groups="hisilicon" />
+  <project path="kernel/linaro/hisilicon" name="linux-iks.git" revision="integration-linux-hs" remote="linaro-landing-team-hisilicon" groups="hisilicon" />
   <!-- AOSP kernels -->
   <project path="kernel/samsung/maguro" name="kernel/omap" revision="android-omap-tuna-3.0-jb-mr1.1" groups="galaxynexus" />
   <project path="kernel/asus/grouper" name="kernel/tegra" revision="22b4fcde206e96f57bf0a111403fc3d75532918a" remote="aosp-upstream" groups="nexus7" />
-  <project path="kernel/lge/mako" name="kernel/msm" revision="linaro-android-msm-mako-3.4-jb-mr1-kgsl" groups="nexus4" />
+  <project path="kernel/lge/mako" name="kernel/msm" revision="linaro_android_4.2.2" groups="nexus4" />
   <!-- 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 -->
@@ -60,7 +63,7 @@
   <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" groups="common" />
   <project path="device/asus/grouper" name="device/asus/grouper" revision="linaro-playground" groups="nexus7" />
   <project path="device/asus/tilapia" name="device/asus/tilapia" groups="nexus7" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7-linaro" groups="linux,arm,common" revision="master" />
-
+  <!-- Linaro modifications: New init.rc, bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" groups="common" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7-linaro" groups="linux,arm,common" revision="master" />
 </manifest>