summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-12-12 20:27:47 +0000
committerKoen Kooi <koen@openembedded.org>2006-12-12 20:27:47 +0000
commit44fd0a5b1ae5367de691e3437ae9832d800c22e7 (patch)
tree109ae8782937b1d768db72b56496fe921bc912d4 /conf/machine
parent33a1e2e14f1d92a015887d13ff228e2771573683 (diff)
parent3eda560ee66482cb9954d538b5c2743942dda260 (diff)
merge of '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'
and 'aa6010d679e0e80d63f4e63191b66e5759482858'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/compulab-pxa270.conf2
-rw-r--r--conf/machine/efika.conf1
-rw-r--r--conf/machine/logicpd-pxa270.conf2
-rw-r--r--conf/machine/storcenter.conf2
-rw-r--r--conf/machine/x86.conf6
5 files changed, 11 insertions, 2 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/efika.conf b/conf/machine/efika.conf
index d2a0e542d8..5b2c87b55c 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -6,6 +6,7 @@
TARGET_ARCH = "powerpc"
PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci alsa"
PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
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/storcenter.conf b/conf/machine/storcenter.conf
index 2c21b521c3..a36684b758 100644
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -1,7 +1,7 @@
TARGET_ARCH = "powerpc"
TARGET_OS = "linux"
# TARGET_VENDOR = "oe"
-IPKG_ARCHS = "all ppc powerpc ppc603e ${MACHINE}"
+PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
# terminal specs - console, but no other ports
SERIAL_CONSOLE="115200 console"
USE_VT="0"
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"