h4000: converted to task-base

diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 41301c1..2054d35 100644 (file)
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -2,35 +2,27 @@
 #@NAME: HP iPAQ h4xxx
 #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx
 
-INHERIT += "linux_modules"
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h4000"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
 ROOT_FLASH_SIZE = "32"
-MODUTILS = "26"
 PCMCIA_MANAGER = "pcmciautils"
 
-BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils kernel udev module-init-tools"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget"
 
-#ship in rootfs:
-H4000_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-module-snd_pcm_oss "
 
 #autoload on boot:
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_g_ether = "g_ether"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
-
 USE_VT = "0"
 
-include conf/machine/include/handheld-common.conf
-
 GUI_MACHINE_CLASS = "smallscreen"
 
 include conf/machine/include/tune-xscale.conf