summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-11-30 10:54:36 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2006-11-30 10:54:36 +0000
commitd094508a2f042069c31d1026647981d615bea777 (patch)
treee8b34a8d7d22b8839101068a830181afd4f02a5f /conf
parentc7dd88e7a214e05e7657034a438915c77bd9eea3 (diff)
collie: converted to task-base
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/collie.conf18
1 files changed, 12 insertions, 6 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index fcaa2ff046..deefa1b698 100644
--- 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"