summaryrefslogtreecommitdiff
path: root/conf/machine/collie.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/collie.conf')
-rw-r--r--conf/machine/collie.conf22
1 files changed, 6 insertions, 16 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index deefa1b698..e7e867e539 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,19 +3,11 @@
#@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
-#
-# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
-# no usbgadget feature because 2.4 kernel handle it in own way on each machine
-#
-MACHINE_FEATURES = "kernel24 apm pcmcia screen irda"
+MACHINE_KERNEL_VERSION ?= "2.4"
+include conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor sharp-sdmmc-support"
-
-# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
# This is needed for the ramdisk script to work
MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
@@ -24,14 +16,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
IMAGE_LINGUAS = ""
-include conf/machine/include/tune-strongarm.conf
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
-SERIAL_CONSOLE = "115200 ttyS0"
+include conf/machine/include/tune-strongarm.conf
ROOT_FLASH_SIZE = "14"
# actually 14680064, see EXTRA_IMAGECMD above
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-
MACHINE_TASK_PROVIDER = "task-base"
+GUI_MACHINE_CLASS_poodle = "smallscreen"