Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/13 15:27:43+02:00 utwente.nl!koen
h1940.conf:  adjust xserver dp, couresy Arjan Schrijver

BKrev: 42ad8cb9rAI8-1Y6FlpcXAI027rw3g

diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index e69de29..122be30 100644 (file)
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: h1940
+#@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940
+
+IPKG_ARCHS = "all arm h3900 ${MACHINE}"
+TARGET_ARCH = arm
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools"
+
+HANDHELD_MODULES = "fat vfat nfs \
+bluetooth rfcomm bnep l2cap hci_uart \
+irda irlan irtty ircomm ircomm-tty \
+"
+
+BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts"
+BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}')}"
+
+INHERIT += "linux_modules"
+