From 45c2833bbaa71cc0dca91f4e9d46485d3d105e8b Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <arjan@anymore.nl>
Date: Mon, 25 Dec 2006 13:49:10 +0000
Subject: h1940: updated machine config

---
 conf/machine/h1940.conf | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index 08104624ca..abae748589 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -4,17 +4,24 @@
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools"
+#BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools"
+
+# Set features for task-base
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen"
 
+# Empty modules list for now
 HANDHELD_MODULES = ""
 
-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}', d)}"
+#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}', d)}"
 
-INHERIT += "linux-kernel-base"
+#INHERIT += "linux-kernel-base"
 
+# Some extra configuration
 GUI_MACHINE_CLASS = "smallscreen"
+SERIAL_CONSOLE = "115200 ttySAC2 vt100"
+USE_VT = "0"
 
-- 
cgit v1.2.3