summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-12-11 16:04:10 +0000
committerRod Whitby <rod@whitby.id.au>2006-12-11 16:04:10 +0000
commit4811267ed17876256f6dcef23d4a7bad4ec1419e (patch)
tree983a8e213866f1f1a268a2ef68ebab5fc767035c
parente6a2b2ac8dcb7e97c6cca25da0cce4baa0e80059 (diff)
parent8c3c711fb45f3cec67ef31fd813daf23a3d44a32 (diff)
merge of 64156492c5abe45f3de49419a3e7b50e836f2724
and be66fa1ec63e7ff15377a6a8dcde064534caf6f5
-rw-r--r--conf/machine/compulab-pxa270.conf2
-rw-r--r--conf/machine/logicpd-pxa270.conf2
-rw-r--r--conf/machine/x86.conf6
3 files changed, 9 insertions, 1 deletions
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index b49bf48d07..12f82773d4 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -19,4 +19,6 @@ ROOT_FLASH_SIZE = "32"
EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index dc41e7c2fd..8fd58bb5ed 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -24,4 +24,6 @@ ROOT_FLASH_SIZE = "32"
EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index b2147f2c0d..91663dfd7c 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -8,7 +8,11 @@ TARGET_ARCH = "i486"
PACKAGE_EXTRA_ARCHS = "x86"
PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
# todo: convert to task-base
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+MACHINE_FEATURES = "kernel26 pci usbhost"
udevdir = "/dev"
OLDEST_KERNEL = "2.6.17"