From: Koen Kooi <koen@openembedded.org>
Date: Mon, 28 Aug 2006 07:50:47 +0000 (+0000)
Subject: h5xxx: add apprpriate MACHINE FEATURES
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6da4ca0d13301c94601f28e825e6c722b84cca6;p=openembedded.git

h5xxx: add apprpriate MACHINE FEATURES
---

diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
index 32e9304cdb..008bfb252f 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5xxx.conf
@@ -2,8 +2,8 @@
 #@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
 #@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
 
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
+#KERNEL ?= "kernel24"
+KERNEL ?= "kernel26"
 
 OVERRIDES =. "${KERNEL}:"
 
@@ -12,12 +12,14 @@ INHERIT += "linux_modules"
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
+#PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
 
 ROOT_FLASH_SIZE = "32"
 
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget usbhost"
+
 BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}"
 BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"