summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-02 20:10:06 +0000
committerChris Larson <clarson@kergoth.com>2004-11-02 20:10:06 +0000
commit19db883ac9a0a71bb3e875e6cc991baea3a15701 (patch)
treeaf9e6f949528ccbe36aa9f29949efe6dee543ea1 /conf/machine
parentf9d59090277f62f66eb9b54c84e4c41cab27b812 (diff)
Merge openembedded@openembedded.bkbits.net:packages-devel
into handhelds.org:/home/kergoth/code/packages 2004/11/02 14:08:16-06:00 handhelds.org!kergoth Prefer module-init-tools-cross for the openslug distro. 2004/11/02 14:06:33-06:00 handhelds.org!kergoth Add module-init-tools-cross, and create a virtual provider for the cross depmod so that it gets used when appropriate. BKrev: 4187e99evDd60POax4fUtUHxR0fW7A
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/ipaq-pxa-2.6.conf1
-rw-r--r--conf/machine/jornada56x.conf19
-rw-r--r--conf/machine/omap1610h2.conf5
3 files changed, 23 insertions, 2 deletions
diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf
index 7c48779784..7cde4217aa 100644
--- a/conf/machine/ipaq-pxa-2.6.conf
+++ b/conf/machine/ipaq-pxa-2.6.conf
@@ -2,6 +2,7 @@ IPKG_ARCHS = "all arm ipaqpxa ${MACHINE}"
TARGET_ARCH = arm
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral module-init-tools"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules modutils-collateral module-init-tools"
include conf/machine/handheld-common.conf
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index e69de29bb2..e7f508b36d 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@NAME: HP Jornada 56x
+#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 56x palmtop computer
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools"
+
+EXTRA_IMAGECMD_jornada56x = "-e 0x40000 -p"
+
+SERIAL_CONSOLE = "115200 ttySA0"
+USE_DEVFS = "1"
+
+include conf/handheld-common.conf
+include conf/tune-strongarm.conf
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index 04a1c74665..51c9af2126 100644
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -6,8 +6,9 @@ TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm armv5te ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral"
-BOOTSTRAP_EXTRA_RDEPENDS = "modutils-collateral"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral"
+BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"