merge of '4b30415f5d28ab66598f7324bc7a1a3f91781ed2'

     and '65fbfb9dd8770a45ce93446888e70c955e6b11d1'

5 files changed, 8 insertions, 48 deletions

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index b9e6f6e6aa..04e0e83051 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -6,18 +6,13 @@ TARGET_ARCH = "arm"
 TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-# This is needed for the ramdisk script to work
-MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
-
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 IMAGE_LINGUAS = ""
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
-
-GUI_MACHINE_CLASS_poodle = "smallscreen"
diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc
deleted file mode 100644
index 8f8ccafeb1..0000000000
--- a/conf/machine/include/collie-2.6.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-SERIAL_CONSOLE = "115200 ttySA0"
-MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi vfat"
-
-MACHINE_EXTRA_RDEPENDS = "kernel-modules"
-
-MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
-
-zaurus_make_installkit () {
-    cd ${DEPLOY_DIR_IMAGE}
-    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
-    if [ "${MACHINE}" = "spitz" ]; then
-        cp gnu-tar ${IMAGE_NAME}-installkit/
-        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
-    else
-        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
-    fi
-
-    # All zaurus machines except collie need updater.sh
-    if [ "${MACHINE}" != "collie" ]; then
-        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
-    fi
-
-    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
-    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
-    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
-}
-
-
diff --git a/conf/machine/include/poodle-2.6.inc b/conf/machine/include/poodle-2.6.inc
deleted file mode 100644
index fa24a3281b..0000000000
--- a/conf/machine/include/poodle-2.6.inc
+++ /dev/null
@@ -1 +0,0 @@
-require conf/machine/include/zaurus-2.6.inc
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index eb020dbcba..a0a71a2969 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -1,8 +1,9 @@
-# Zaurus Clamshell specific configuration for kernel 2.6
-# Don't forget to include zaurus-clamshell.inc as well
+# Zaurus specific configuration for kernel 2.6
+# Additionally, clamshell specific stuff in zaurus-clamshell.inc
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+PACKAGE_EXTRA_ARCHS_collie = ""
 
 MACHINE_KERNEL_VERSION = "2.6"
 
@@ -10,20 +11,15 @@ ERASEBLOCKSIZE = "0x4000"
 ERASEBLOCKSIZE_akita = "0x20000"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
-
 IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
-
 EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.inc
-
 SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
-
 PCMCIA_MANAGER ?= "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index f66502eff1..43c77d42da 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,3 +1,6 @@
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/include/tune-xscale.inc
+
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \