ifc6410: Final tweaks reader for initial release

Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>

1 files changed, 11 insertions, 2 deletions

diff --git a/linaro.xml b/linaro.xml
index 731c972..b4c2934 100644
--- a/linaro.xml
+++ b/linaro.xml
@@ -43,9 +43,18 @@
   <project path="device/linaro/ifc6410" name="device/linaro/ifc6410" revision="linaro-lollipop" remote="drt" groups="non-default,ifc6410" />
   <project path="kernel/linaro/ifc6410" name="linux" revision="ifc6410_lollipop" remote="drt" groups="non-default,ifc6410" />
   <!-- The default Android compiler has bugs that prevents us from building
-       a working mainline kernel. For that reason the IFC6410 we pull in an
-       additional compiler. It is used only to build the kernel. -->
+       a working mainline kernel. For that reason for the IFC6410 we pull in
+       an additional compiler. It is used only to build the kernel. -->
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" revision="master" groups="pdk,linux,arm" />
+  <!-- IFC6410 has the hardware name "Qualcomm (Flattened Device Tree)" so
+       we need an additional patch for system/core to avoid the brackets
+       leaking into filenames. -->
+  <remove-project path="system/core" name="platform/system/core" />
+  <project path="system/core" name="platform/system/core" revision="linaro-lollipop" remote="drt" groups="pdk" />
+  <!-- These tests do not compile with recent kernels due to new BUILD_BUG_ONs.
+       Fixes have not yet been applied upstream. For now just disable them -->
+  <remove-project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" />
+
 
   <!-- NFS conversion tools -->
   <project path="external/linaro-android-tools" name="platform/external/linaro-android-tools" revision="linaro_android_4.4" groups="common" />