iMX53: Switch to kernel 3.1

With the latest changes, kernel 3.1 finally boots iMX53.
Switch over, and remove the wip-iMX53 build now that
staging-iMX53 has caught up with it.

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Change-Id: Ie4768021a5c214812490d1067652f65af2557f32

2 files changed, 4 insertions, 239 deletions

diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 4e8977484..f73bac407 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -69,14 +69,14 @@
   <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
   <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
   <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-  
+
   <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
-  <!--project path="kernel" name="bsp/freescale/linux-linaro-android" revision="lt-android-38" remote="linaro-other" / -->
-  <project path="kernel" name="people/bernhardrosenkranzer/android-kernel-iMX53" revision="linaro-android-11.07" remote="linaro-other"/>
-  <!--project path="kernel" name="kernel/imx53" revision="lt-3.1-android" remote="linaro-android"/ -->
+  <!-- Landing team upstream: project path="kernel" name="bsp/freescale/linux-linaro-android" revision="lt-3.1-android" remote="linaro-other" / -->
+  <!-- Old (2.6.38): project path="kernel" name="people/bernhardrosenkranzer/android-kernel-iMX53" revision="linaro-android-11.07" remote="linaro-other"/ -->
+  <project path="kernel" name="kernel/imx53" revision="lt-3.1-android" remote="linaro-android"/>
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <!-- project path="u-boot" name="uboot-imx.git" revision="master" remote="freescale" / -->
 
diff --git a/wip-iMX53.xml b/wip-iMX53.xml
deleted file mode 100644
index bc002666c..000000000
--- a/wip-iMX53.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote  name="korg"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
-
-  <remote  name="linaro-android"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-
-  <remote  name="linaro-other"
-           fetch="git://git.linaro.org/" />
-
-  <remote  name="0xbench"
-           fetch="git://gitorious.org/0xbench/" />
-
-  <remote  name="gitorious"
-           fetch="git://gitorious.org/" />
-
-  <remote  name="omapzoom"
-           fetch="git://git.omapzoom.org/repo/" />
-
-  <remote  name="freescale"
-           fetch="http://opensource.freescale.com/pub/scm/imx/" />
-
-  <!-- GATOR -->
-  <project path="external/gator" name="people/pawelmoll/gator" revision="android" remote="linaro-other" />
-
-  <!-- Linaro changes -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="device/linaro/iMX53" name="device/linaro/imx53" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/linaro/pandaboard" name="hardware/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="android" />
-
-  <!-- Multimedia extensions -->
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
-  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
-
-  <!-- Power WG -->
-  <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
-  <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
-  <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-  
-  <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
-    <copyfile src="core/root.mk" dest="Makefile" />
-  </project>
-
-  <!--project path="kernel" name="bsp/freescale/linux-linaro-android" revision="lt-android-38" remote="linaro-other" / -->
-  <!--project path="kernel" name="people/bernhardrosenkranzer/android-kernel-iMX53" revision="linaro-android-11.07" remote="linaro-other"/ -->
-  <project path="kernel" name="kernel/imx53" revision="lt-3.1-android" remote="linaro-android"/>
-  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
-  <!-- project path="u-boot" name="uboot-imx.git" revision="master" remote="freescale" / -->
-
-  <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="platform/packages/apps/mmtest" revision="master" remote="linaro-android" />
-  <project path="packages/apps/glmark2" name="people/afrantzis/glmark2" revision="master" remote="linaro-other" />
-
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="1.2-beta-linaro-andoid" remote="linaro-other" />
-  <project path="external/dbus" name="platform/external/dbus" revision="linaro-master" remote="linaro-android" />
-  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <!-- x-loader -->
-  <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-
-  <!-- standard Andorid manifest -->
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="cts" name="platform/cts" />
-  <project path="development" name="platform/development" />
-  <project path="device/common" name="device/common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
-  <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/crespo" name="device/samsung/crespo" />
-  <project path="external/alsa-utils" name="platform/external/alsa-utils" revision="master" />
-  <project path="external/alsa-lib" name="platform/external/alsa-lib" revision="master" />
-  <project path="external/apache-http" name="platform/external/apache-http" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
-  <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/chromium" name="platform/external/chromium" />
-  <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dropbear" name="platform/external/dropbear" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-  <project path="external/easymock" name="platform/external/easymock" />
-  <project path="external/elfutils" name="platform/external/elfutils" />
-  <project path="external/embunit" name="platform/external/embunit" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/esd" name="platform/external/esd" />
-  <project path="external/expat" name="platform/external/expat" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" />
-  <project path="external/giflib" name="platform/external/giflib" />
-  <project path="external/grub" name="platform/external/grub" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="external/guava" name="platform/external/guava" />
-  <project path="external/iproute2" name="platform/external/iproute2" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/jdiff" name="platform/external/jdiff" />
-  <project path="external/jhead" name="platform/external/jhead" />
-  <project path="external/jsr305" name="platform/external/jsr305" />
-  <project path="external/junit" name="platform/external/junit" />
-  <project path="external/kernel-headers" name="platform/external/kernel-headers" />
-  <project path="external/libffi" name="platform/external/libffi" />
-  <project path="external/libgsm" name="platform/external/libgsm" />
-  <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="platform/external/libpng" />
-  <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/mtpd" name="platform/external/mtpd" />
-  <project path="external/netcat" name="platform/external/netcat" />
-  <project path="external/netperf" name="platform/external/netperf" />
-  <project path="external/neven" name="platform/external/neven" />
-  <project path="external/nist-sip" name="platform/external/nist-sip" />
-  <project path="external/oauth" name="platform/external/oauth" />
-  <project path="external/openssl" name="platform/external/openssl" />
-  <project path="external/oprofile" name="platform/external/oprofile" />
-  <project path="external/ping" name="platform/external/ping" />
-  <project path="external/ppp" name="platform/external/ppp" />
-  <project path="external/proguard" name="platform/external/proguard" />
-  <project path="external/protobuf" name="platform/external/protobuf" />
-  <project path="external/qemu" name="platform/external/qemu" />
-  <project path="external/quake" name="platform/external/quake" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/sonivox" name="platform/external/sonivox" />
-  <project path="external/speex" name="platform/external/speex" />
-  <project path="external/sqlite" name="platform/external/sqlite" />
-  <project path="external/srec" name="platform/external/srec" />
-  <project path="external/strace" name="platform/external/strace" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/v8" name="platform/external/v8" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" />
-  <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
-  <project path="ndk" name="platform/ndk" />
-  <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
-  <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
-  <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
-  <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="packages/inputmethods/PinyinIME" name="platform/packages/inputmethods/PinyinIME" />
-  <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider" />
-  <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" />
-  <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" />
-  <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" />
-  <project path="packages/providers/DrmProvider" name="platform/packages/providers/DrmProvider" />
-  <project path="packages/providers/GoogleContactsProvider" name="platform/packages/providers/GoogleContactsProvider" />
-  <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" />
-  <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" />
-  <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" />
-  <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
-  <project path="prebuilt" name="platform/prebuilt" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" />
-  <project path="system/extras" name="platform/system/extras" />
-  <project path="system/netd" name="platform/system/netd" />
-
-</manifest>