collie: converted to task-base

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index fcaa2ff..deefa1b 100644 (file)
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -5,16 +5,20 @@
 TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs  \
-sharp-sdmmc-support" 
-BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor \
-altboot"
+
+#
+# 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_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
 
 # This is needed for the ramdisk script to work
-BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
+MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
@@ -29,3 +33,5 @@ ROOT_FLASH_SIZE = "14"
 
 # Later versions are broken on kernel 2.4
 PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+MACHINE_TASK_PROVIDER = "task-base"