update manifest for linaro-oreo builds

Change-Id: I632d4f0e65f0198ca7c252c0402912e68c24c577
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

10 files changed, 135 insertions, 29 deletions

diff --git a/.gitreview b/.gitreview
index 6ccec9e00..5e1178ad6 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=android-review.linaro.org
 port=29418
 project=platform/manifest.git
-defaultbranch=linaro-nougat
+defaultbranch=linaro-oreo
diff --git a/arm.xml b/arm.xml
new file mode 100644
index 000000000..85451a8db
--- /dev/null
+++ b/arm.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <!-- Linaro Device Configs -->
+  <project path="device/linaro/juno" name="android/device/linaro/juno" revision="linaro-oreo" remote="linaro-android" groups="device,arm"/>
+  <project path="device/linaro/juno_prebuilt_kernel" name="android/device/linaro/juno_prebuilt_kernel" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm"/>
+  <!-- project path="device/linaro/juno32" name="device/linaro/juno32" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm"/ -->
+  <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-nougat" remote="linaro-android" groups="device,lsk,arm"/>
+  <project path="device/linaro/fvp" name="device/linaro/fvp-armv8" revision="linaro-nougat" remote="linaro-android" groups="device,lsk,arm"/>
+
+  <!-- Linaro Kernels -->
+  <project path="kernel/linaro/armlt" name="landing-teams/working/arm/kernel-release" revision="lsk-4.4-armlt" remote="linaro-other" groups="device,arm" />
+
+  <!-- Linaro Bootloaders -->
+  <project path="vexpress-firmware" name="arm/vexpress-firmware" revision="juno-recovery-tarball" remote="linaro-other" groups="device,arm" />
+
+</manifest>
diff --git a/hikey.xml b/hikey.xml
new file mode 100644
index 000000000..b2873f7df
--- /dev/null
+++ b/hikey.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <!-- Let's pull in more current versions of hikey device configs -->
+  <!--
+  <remove-project name="device/linaro/hikey"/>
+  <remove-project name="device/linaro/hikey-kernel"/>
+  <project path="device/linaro/hikey" name="device/linaro/hikey" revision="master" remote="aosp" groups="device,hikey" />
+  <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" />
+
+</manifest>
diff --git a/linaro-pm-extras.xml b/linaro-pm-extras.xml
new file mode 100644
index 000000000..3a61a5696
--- /dev/null
+++ b/linaro-pm-extras.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+	<project path="external/powertop" name="platform/external/powertop-2.0" revision="linaro-oreo" groups="common" remote="linaro-android"/>
+	<project path="external/powerdebug" name="platform/external/powerdebug" revision="android-master" 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"/>
+</manifest>
diff --git a/linaro-toolchains.xml b/linaro-toolchains.xml
new file mode 100644
index 000000000..7013ad44e
--- /dev/null
+++ b/linaro-toolchains.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <!-- Linaro Toolchains -->
+<!--
+  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.4-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.4-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.4-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.4-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-6.1-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-6.1-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-6.1-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-6.1-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-6.3-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-6.3-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-6.3-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-6.3-linaro" remote="linaro-android" revision="master" />
+-->
+</manifest>
diff --git a/linaro.xml b/linaro.xml
index fbd41968a..2468b4414 100644
--- a/linaro.xml
+++ b/linaro.xml
@@ -2,43 +2,21 @@
 <manifest>
   <!-- Repositories -->
   <!-- Linaro Repositories -->
-  <remote name="linaro-android"
-          fetch="http://android-git.linaro.org/git/"
-          review="android-review.linaro.org" />
-  <remote name="linaro-other"
-          fetch="http://git.linaro.org/" />
+  <remote name="linaro-android" fetch="http://android-git.linaro.org/git/" review="android-review.linaro.org" />
+  <remote name="linaro-other" fetch="http://git.linaro.org/" />
 
   <!-- Linaro AddOn Projects -->
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" groups="device,arm"/>
   <!-- Linaro Tests -->
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro-marshmallow" remote="linaro-android"/>
+  <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-nougat" remote="linaro-android"/>
-  <project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" revision="linaro-nougat" remote="linaro-android"/>
+  <project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" revision="linaro-oreo" remote="linaro-android"/>
   <project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" revision="linaro-nougat" 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-nougat" remote="linaro-android" groups="device,arm"/>
-  <project path="device/linaro/juno_prebuilt_kernel" name="android/device/linaro/juno_prebuilt_kernel" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm"/>
-  <!-- project path="device/linaro/juno32" name="device/linaro/juno32" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm"/ -->
-  <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="linaro-nougat"/>
-  <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-nougat" remote="linaro-android" groups="device,lsk,arm"/>
-  <project path="device/linaro/fvp" name="device/linaro/fvp-armv8" revision="linaro-nougat" remote="linaro-android" groups="device,lsk,arm"/>
-  <!-- Let's pull in more current versions of hikey device configs -->
-  <remove-project name="device/linaro/hikey"/>
-  <remove-project name="device/linaro/hikey-kernel"/>
-  <project path="device/linaro/hikey" name="device/linaro/hikey" revision="master" remote="aosp" groups="device,hikey" />
-  <project path="device/linaro/hikey-kernel" name="device/linaro/hikey-kernel" revision="master" remote="aosp" groups="device,hikey" />
-
-  <!-- Linaro Kernels -->
-  <project path="kernel/linaro/armlt" name="landing-teams/working/arm/kernel-release" revision="lsk-3.18-armlt" remote="linaro-other" groups="device,arm" />
-  <project path="kernel/linaro/hisilicon" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.4" remote="aosp" groups="device,hikey" />
-
-  <!-- Linaro Bootloaders -->
-  <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" groups="device,arm" />
-  <project path="vexpress-firmware" name="arm/vexpress-firmware" revision="juno-recovery-tarball" remote="linaro-other" groups="device,arm" />
-
+  <!--Linaro common device configuration repository used by all platforms  -->
+  <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="linaro-oreo"/>
 </manifest>
diff --git a/optee.xml b/optee.xml
new file mode 100644
index 000000000..b7381c894
--- /dev/null
+++ b/optee.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote name="github-optee" fetch="https://github.com/" />
+
+  <project path="external/optee_test" name="OP-TEE/optee_test" revision="refs/tags/2.5.0" remote="github-optee" />
+  <project path="external/optee_client" name="OP-TEE/optee_client" revision="refs/tags/2.5.0" remote="github-optee" />
+  <project path="optee/optee_os" name="OP-TEE/optee_os" revision="refs/tags/2.5.0" remote="github-optee" />
+  <project path="external/optee_hello_world" name="linaro-swg/hello_world" revision="master" remote="github-optee" />
+
+</manifest>
diff --git a/update-externals.xml b/update-externals.xml
new file mode 100644
index 000000000..bc49b3442
--- /dev/null
+++ b/update-externals.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <!-- Projects with newer upstream versions -->
+  <!-- sqlite -->
+<!--
+  <remove-project name="platform/external/sqlite" />
+  <project path="external/sqlite" name="platform/external/sqlite" remote="linaro-android" revision="linaro-upstream-3.16.2" />
+-->
+  <!-- giflib -->
+<!--
+  <remove-project name="platform/external/giflib" />
+  <project path="external/giflib" name="platform/external/giflib" remote="linaro-android" revision="linaro-upstream-5.1.4" />
+-->
+  <!-- use the libpng 1.6.25 of AOSP-->
+<!--
+  <remove-project name="platform/external/libpng" />
+  <project path="external/libpng" name="platform/external/libpng" remote="linaro-android" revision="c7ef7361311966304711b45ce62363991b068682" />
+-->
+  <!-- harfbuzz-ng -->
+<!--
+  <remove-project name="platform/external/harfbuzz_ng" />
+  <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" remote="linaro-android" revision="linaro-upstream-0.9.41" />
+-->
+  <!-- fio -->
+  <remove-project name="platform/external/fio" />
+  <project path="external/fio" name="platform/external/fio" revision="master" />
+  <!-- e2fsprogs -->
+  <remove-project name="platform/external/e2fsprogs" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="master" />
+  <!-- libexif -->
+  <remove-project name="platform/external/libexif" />
+  <project path="external/libexif" name="platform/external/libexif" revision="master" />
+  <!-- cblas -->
+  <remove-project name="platform/external/cblas" />
+  <project path="external/cblas" name="platform/external/cblas" revision="master" />
+  <!-- f2fs-tools -->
+  <remove-project name="platform/external/eigen" />
+  <project path="external/eigen" name="platform/external/eigen" revision="master" />
+</manifest>
diff --git a/x15.xml b/x15.xml
index 401278814..3f9cbf5bb 100644
--- a/x15.xml
+++ b/x15.xml
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
+  <!-- TI repositories -->
+  <remote name="git-ti-mirror" fetch="git://git.ti.com/" />
+
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open-jacinto" revision="d-nougat-release" remote="linaro-android" groups="device,ti" />
   <project path="device/ti/am57xevm" name="device/ti/am57xevm" revision="d-nougat-release" remote="linaro-android" groups="device,ti" />
+  <!--mirror of http://git.ti.com/android-sdk/device-ti-jacinto6evm  -->
+  <project path="device/ti/jacinto6evm" name="device/ti/jacinto6evm.git/" revision="d-nougat-release" remote="linaro-android" groups="device,ti" />
   <project path="hardware/ti/dra7xx" name="hardware/ti/dra7xx" revision="d-nougat-release" remote="linaro-android" groups="device,ti" />
   <project path="hardware/ti/ipc" name="hardware/ti/ipc" revision="refs/tags/3.43.00.01" remote="linaro-android" groups="device,ti" />
   <project path="hardware/ti/linuxutils" name="hardware/ti/linuxutils" revision="refs/tags/4.11.00.01" remote="linaro-android" groups="device,ti" />
   <project path="hardware/ti/dce" name="hardware/ti/dce" revision="refs/tags/3.00.11.00" remote="linaro-android" groups="device,ti" />
+
+  <!-- mirror of http://git.ti.com/android-sdk/u-boot/ -->
+  <project path="ti/u-boot" name="u-boot/linaro/jacinto6evm.git" revision="p-ti-u-boot-2016.05" remote="linaro-android" groups="device,ti" />
+  <!--
+  Changed to use mirror from android-git.linaro.org instead of
+  https://git.ti.com/android-sdk/kernel-omap/commits/p-ti-lsk-android-linux-4.4.y
+  -->
+  <project path="kernel/ti/x15" name="kernel/omap-omapzoom.git" revision="p-ti-lsk-android-linux-4.4.y" remote="linaro-android" groups="device,ti" />
+
 </manifest>
diff --git a/x20.xml b/x20.xml
new file mode 100644
index 000000000..0526d27fe
--- /dev/null
+++ b/x20.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+	<!-- remote name="github-x20" fetch="https://github.com/helio-x20" / -->
+	<remote name="github-x20" fetch="https://github.com/berolinaro" />
+
+	<project path="device/mediatek/common" name="device/mediatek/common" remote="linaro-android" revision="master" groups="device,mtk"/>
+	<project path="device/mediatek/mt6797" name="device/mediatek/mt6797" remote="linaro-android" revision="master" groups="device,mtk"/>
+	<project path="device/amt/amt6797_64_open" name="device/amt/amt6797_64_open" remote="linaro-android" revision="master" groups="device,mtk"/>
+	<project path="vendor/mediatek" name="vendor/mediatek" remote="linaro-android" revision="master" groups="device,mtk" />
+	<project path="vendor/amt" name="vendor/amt" remote="linaro-android" revision="master" groups="device,mtk" />
+	<project path="prebuilts/gcc/linux-x86/arm/gcc-arm-none-eabi-4_8-2014q3" name="prebuilts/gcc/linux-x86/arm/gcc-arm-none-eabi-4_8-2014q3" remote="linaro-android" revision="master" groups="device,mtk"/>
+	<!-- project path="kernel/amt/amt6797_64_open" name="linux" remote="github-x20" revision="helio-x20" groups="device,mtk" / -->
+	<project path="kernel/amt/amt6797_64_open" name="linux-1" remote="github-x20" revision="helio-x20" groups="device,mtk" />
+
+</manifest>