update with p-preview branches for some projects

also delete x20.xml

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

5 files changed, 34 insertions, 34 deletions

diff --git a/linaro-pm-extras.xml b/linaro-pm-extras.xml
index 3a61a5696..88f6e4cc1 100644
--- a/linaro-pm-extras.xml
+++ b/linaro-pm-extras.xml
@@ -1,7 +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/powertop" name="platform/external/powertop-2.0" revision="linaro-p-preview" groups="common" remote="linaro-android"/>
+	<project path="external/powerdebug" name="platform/external/powerdebug" revision="linaro-p-preview" 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/pm-qa" name="platform/external/pm-qa" revision="android-linaro-p-preview" groups="common" remote="linaro-android"/>
 </manifest>
diff --git a/linaro-toolchains.xml b/linaro-toolchains.xml
index 7013ad44e..1f508287d 100644
--- a/linaro-toolchains.xml
+++ b/linaro-toolchains.xml
@@ -9,4 +9,5 @@
   <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" />
 -->
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-7.2-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-7.2" remote="linaro-android" revision="master" clone-depth="1"/>
 </manifest>
diff --git a/linaro.xml b/linaro.xml
index 0fe134624..0896c1b29 100644
--- a/linaro.xml
+++ b/linaro.xml
@@ -5,18 +5,18 @@
   <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-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-oreo" remote="linaro-android"/>
-  <project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" revision="linaro-oreo" 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/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 common device configuration repository used by all platforms  -->
-  <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="linaro-oreo"/>
+  <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="linaro-p-preview"/>
+
+  <project path="android-patchsets" name="android-patchsets" revision="master" remote="linaro-android"/>
+  <project path="android-build-configs" name="android-build-configs" revision="master" remote="linaro-android"/>
 </manifest>
diff --git a/x15.xml b/x15.xml
index 4e9d250bf..a6a635362 100644
--- a/x15.xml
+++ b/x15.xml
@@ -9,22 +9,36 @@
           fetch="git://git.ti.com" />
 
   <!-- TI addons -->
-  <project path="device/ti/proprietary-open" name="android/device-ti-proprietary-open" remote="git-ti-com" revision="d-oreo-r6-release" groups="device,ti" />
-  <project path="device/ti/jacinto6evm" name="android/device-ti-jacinto6evm" remote="git-ti-com" revision="d-oreo-r6-release" groups="device,ti" />
-  <project path="device/ti/am57xevm" name="android/device-ti-am57xevm" remote="git-ti-com" revision="d-oreo-r6-release" groups="device,ti" />
+  <project path="device/ti/proprietary-open" name="android/device-ti-proprietary-open" remote="git-ti-com" revision="d-oreo-mr1-core-release" groups="device,ti" />
+  <project path="device/ti/jacinto6evm" name="android/device-ti-jacinto6evm" remote="git-ti-com" revision="d-oreo-mr1-core-release" groups="device,ti" />
+  <project path="device/ti/am57xevm" name="android/device-ti-am57xevm" remote="git-ti-com" revision="d-oreo-mr1-core-release" groups="device,ti" />
 
-  <!-- TI Connectivity -->
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" remote="omap-mirror" revision="d-oreo-r6-release" groups="device,ti" />
+  <!-- CORE-COMMON: TI addons -->
+  <project path="external/kmsxx" name="android/external-kmsxx" remote="git-ti-com" revision="d-oreo-mr1-core-release" groups="ti" />
 
-  <!-- TI MM -->
-  <project path="hardware/ti/dra7xx" name="platform/hardware/ti/dra7xx" remote="omap-mirror" revision="d-oreo-r6-release" groups="device,ti" />
+  <!-- CORE-EXT: TI Connectivity -->
+  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" remote="omap-mirror" revision="d-oreo-mr1-release" groups="ti" />
+
+  <!-- CORE-EXT: TI MM -->
+  <project path="hardware/ti/dra7xx" name="android/hardware-ti-dra7xx" remote="git-ti-com" revision="d-oreo-mr1-core-release" groups="device,ti" />
   <project path="hardware/ti/ipc" name="ipc/ipcdev" remote="git-ti-com" revision="refs/tags/3.47.00.00" groups="device,ti" />
   <project path="hardware/ti/linuxutils" name="ipc/ludev" remote="git-ti-com" revision="lu-next" groups="device,ti" />
   <project path="hardware/ti/dce" name="repo/libdce" remote="omap-mirror" revision="refs/tags/3.00.14.00" groups="device,ti" />
 
   <!-- http://git.ti.com/cgit/cgit.cgi/android/u-boot.git/log/?h=p-ti-u-boot-2016.05 -->
-  <project path="ti/u-boot" name="android/u-boot.git" revision="p-ti-u-boot-2016.05" remote="git-ti-com" groups="device,ti" />
+  <!-- http://git.ti.com/cgit/cgit.cgi/ti-u-boot/ti-u-boot.git/log/?h=ti-u-boot-2018.01 -->
+  <project path="ti/u-boot" name="ti-u-boot/ti-u-boot.git" revision="ti-u-boot-2018.01" remote="git-ti-com" groups="device,ti" />
   <!-- http://git.ti.com/cgit/cgit.cgi/android/kernel.git/log/?h=p-ti-android-linux-4.4.y -->
-  <project path="kernel/ti/x15" name="android/kernel.git" revision="p-ti-android-linux-4.4.y" remote="git-ti-com" groups="device,ti" />
+  <!-- http://git.ti.com/cgit/cgit.cgi/ti-linux-kernel/ti-linux-kernel.git/log/?h=ti-android-linux-4.14.y -->
+  <project path="kernel/ti/x15" name="ti-linux-kernel/ti-linux-kernel.git" revision="ti-android-linux-4.14.y" remote="git-ti-com" groups="device,ti" />
 
+  <!-- AOSP Forks -->
+  <!--
+  <remove-project name="platform/bootable/recovery" />
+  <project path="bootable/recovery" name="android/platform-bootable-recovery" remote="git-ti-com" revision="d-oreo-mr1-core-release" groups="ti" />
+  <remove-project name="platform/external/libdrm" />
+  <project path="external/libdrm" name="android/external-libdrm" remote="git-ti-com" revision="d-oreo-mr1-core-release" groups="ti" />
+  <remove-project name="platform/frameworks/native" />
+  <project path="frameworks/native" name="android/frameworks-native" remote="git-ti-com" revision="d-oreo-mr1-core-release" groups="ti" />
+  -->
 </manifest>
diff --git a/x20.xml b/x20.xml
deleted file mode 100644
index 0526d27fe..000000000
--- a/x20.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>