6 files changed, 36 insertions, 6 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 82c31cb64a..b1ccf23a7c 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1538,7 +1538,6 @@ PREFERRED_VERSION_python-pylinda ?= "0.6"
 PREFERRED_VERSION_python-pylint ?= "0.13.2"
 PREFERRED_VERSION_python-pymetar ?= "0.11"
 PREFERRED_VERSION_python-pymp3 ?= "0.3.4"
-PREFERRED_VERSION_python-pyqt ?= "4.3"
 PREFERRED_VERSION_python-pyrad ?= "0.8"
 PREFERRED_VERSION_python-pyraf ?= "1.4"
 PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
@@ -1560,7 +1559,6 @@ PREFERRED_VERSION_python-scons-native ?= "0.97"
 PREFERRED_VERSION_python-setuptools ?= "0.6c6"
 PREFERRED_VERSION_python-sgmlop ?= "1.1"
 PREFERRED_VERSION_python-simplejson ?= "1.7.1"
-PREFERRED_VERSION_python-sip ?= "4.7"
 PREFERRED_VERSION_python-snmplib ?= "0.1.1"
 PREFERRED_VERSION_python-soappy ?= "0.11.6"
 PREFERRED_VERSION_python-spydi ?= "0.9.7"
@@ -1721,7 +1719,6 @@ PREFERRED_VERSION_sidplayer ?= "1.5.0"
 PREFERRED_VERSION_silo ?= "1.4.8"
 PREFERRED_VERSION_simh ?= "3.7-1"
 PREFERRED_VERSION_simpad-utilities ?= "1.0"
-PREFERRED_VERSION_sip-native ?= "4.7"
 PREFERRED_VERSION_sip3-native ?= "4.0.1"
 PREFERRED_VERSION_sipsak ?= "0.9.6"
 PREFERRED_VERSION_skippy-xd ?= "0.5.0"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 4e01298bf8..aff3ba90d1 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -151,6 +151,7 @@ FEED_ARCH_nslu2be 	= "armv5teb"
 # armv6
 
 FEED_ARCH_mx31ads 	= "armv6"
+FEED_ARCH_mx31moboard	= "armv6"
 FEED_ARCH_nokia800	= "armv6"  
 FEED_ARCH_omap2420h4	= "armv6"
 FEED_ARCH_omap2430sdp   = "armv6"
diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc
index bc80185fa0..8f8ccafeb1 100644
--- a/conf/machine/include/collie-2.6.inc
+++ b/conf/machine/include/collie-2.6.inc
@@ -12,7 +12,7 @@ zaurus_make_installkit () {
     rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
     mkdir ${IMAGE_NAME}-installkit/
     # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
     if [ "${MACHINE}" = "spitz" ]; then
         cp gnu-tar ${IMAGE_NAME}-installkit/
         cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc
index d84f1efb26..26d1e3f8ca 100644
--- a/conf/machine/include/qemu.inc
+++ b/conf/machine/include/qemu.inc
@@ -1,7 +1,6 @@
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
 
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 3f84138ac8..eb020dbcba 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -49,7 +49,7 @@ zaurus_make_installkit () {
     mkdir ${IMAGE_NAME}-installkit/
 
     # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
 
     if [ "${MACHINE}" = "spitz" ]; then
         cp gnu-tar ${IMAGE_NAME}-installkit/
diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf
new file mode 100644
index 0000000000..c918404d6c
--- /dev/null
+++ b/conf/machine/mx31moboard.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@Name: EPFL mx31MoBoard
+#@DESCRIPTION: Machine configuration for EPFL MX31MoBoard
+#@Website: http://mobots.epfl.ch/mx31MoBoard.html
+
+TARGET_ARCH = "arm"
+TARGET_FPU_arm = "hard"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+
+GUI_MACHINE_CLASS = "smallscreen"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+require conf/machine/include/tune-arm1136jf-s.inc
+
+#
+# usb networking
+#
+module_conf_g_ether = "alias usb0 g_ether"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "-L 115200 ttymxc0 vt100"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
+
+# to avoid annoying jffs2 messages
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000"
+
+IMAGE_FSTYPES += "tar.gz"
+