summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2018-08-10 16:02:36 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2018-08-10 16:02:36 +0800
commita009b9aebfb09debfd6e81ec74ca796d61c06e3f (patch)
tree7e1fa6b8072adb281467ba4ea09c4fac4013aeb7
parent3767469927dfe9ba4114e0c77168229620fff473 (diff)
downloadmanifest-a009b9aebfb09debfd6e81ec74ca796d61c06e3f.tar.gz
hikey.xml & linaro.xml: update for pie support
hikey.xml: use 4.14 kernel as default linaro.xml: exclude piglit, waffle, and linaro-android-userspace-tests which has compiling problem at the moment will add them later after the problem fixed Change-Id: Ic1d59b691d980064d74b0dbdc1e7bf4eac18eb40 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rw-r--r--hikey.xml4
-rw-r--r--linaro.xml4
2 files changed, 6 insertions, 2 deletions
diff --git a/hikey.xml b/hikey.xml
index b2873f7df..4c6959640 100644
--- a/hikey.xml
+++ b/hikey.xml
@@ -9,6 +9,8 @@
<project path="device/linaro/hikey-kernel" name="device/linaro/hikey-kernel" revision="master" remote="aosp" groups="device,hikey" />
-->
<!-- Linaro Kernels -->
- <project path="kernel/linaro/hisilicon" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.9" remote="aosp" groups="device,hikey" />
+ <project path="kernel/linaro/hisilicon-4.4" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.4" groups="hikeynotdefault,notdefault" />
+ <project path="kernel/linaro/hisilicon-4.9" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.9" groups="hikeynotdefault,notdefault" />
+ <project path="kernel/linaro/hisilicon-4.14" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.14" groups="device,hikey" />
</manifest>
diff --git a/linaro.xml b/linaro.xml
index 82d181d32..0630f7418 100644
--- a/linaro.xml
+++ b/linaro.xml
@@ -7,10 +7,12 @@
<!-- Linaro Tests -->
<project path="external/busybox" name="platform/external/busybox" revision="linaro-android" 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-p-preview" remote="linaro-android"/>
- <project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" revision="linaro-p-preview" remote="linaro-android"/>
<project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" revision="linaro-p-preview" remote="linaro-android"/>
+-->
+ <project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" revision="linaro-p-preview" 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"/>