[oe-commits] org.oe.dev h1940: updated machine config

[arjan commit]

h1940: updated machine config

Author: arjan at openembedded.org
Branch: org.openembedded.dev
Revision: 65b511b81bcf7e1ae96e859bfc24c8a5bddfb9bb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=65b511b81bcf7e1ae96e859bfc24c8a5bddfb9bb
Files:
1
conf/machine/h1940.conf
Diffs:

#
# mt diff -r2b6e23ac68e02186b4ddae31bd8871b9569d0b55 -r65b511b81bcf7e1ae96e859bfc24c8a5bddfb9bb
#
# 
# 
# patch "conf/machine/h1940.conf"
#  from [031a25bd53a7d0d2b11d8fb97d4539a9e0842760]
#    to [9858dc065b45d40e3624065c9b082ff4e299853d]
# 
============================================================
--- conf/machine/h1940.conf	031a25bd53a7d0d2b11d8fb97d4539a9e0842760
+++ conf/machine/h1940.conf	9858dc065b45d40e3624065c9b082ff4e299853d
@@ -1,20 +1,27 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: h1940
 #@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940
 
 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"