3 files changed, 21 insertions, 20 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 92651f60f1..b26df9dfea 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,18 +3,29 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
-
-MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
 require conf/machine/include/tune-strongarm.inc
 
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+MACHINE_KERNEL_VERSION = "2.6"
+KERNEL_IMAGE_MAXSIZE = "1048576"
+KERNEL_IMAGETYPE = "zImage"
+SERIAL_CONSOLE = "115200 ttySA0"
+
+ROOT_FLASH_SIZE = "14"
+# actually 14680064, see EXTRA_IMAGECMD
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+XSERVER ?= "xserver-kdrive-fbdev"
 
 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
+PCMCIA_MANAGER ?= "pcmciautils"
 
-XSERVER ?= "xserver-kdrive-fbdev"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
+
+require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index 0a9f209fe2..c8656bb117 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -13,3 +13,4 @@ RDEPENDS_kernel-base = "kernel-image"
 # we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
 DONT_CHECK_KERNELSIZE ?= "1"
 
+MACHINE_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 8fb36f78be..aeba16b67c 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -2,7 +2,6 @@
 # Additionally, clamshell specific stuff in zaurus-clamshell.inc
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS_collie = ""
 
 MACHINE_KERNEL_VERSION = "2.6"
 
@@ -10,14 +9,11 @@ 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}"
 
-ZAURUS-UPDATER_collie = ""
 ZAURUS-UPDATER = "zaurus-updater"
 EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
 
 SERIAL_CONSOLE = "115200 ttyS0"
-SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
@@ -35,16 +31,11 @@ MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-px
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
-MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
-	kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi \
-	kernel-module-power"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GUI_MACHINE_CLASS_collie = "smallscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
 
 KERNEL_IMAGE_MAXSIZE = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
 
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
 
@@ -69,10 +60,8 @@ zaurus_make_installkit () {
         [ -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
+    cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+   
  
     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