htc-universal: convert to task-base

diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 8fae31d..3196982 100644 (file)
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -13,19 +13,18 @@ XSERVER = "xserver-kdrive-fbdev"
 MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen"
 
 MODUTILS = "26"        
-BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${UN_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " udev"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware"
 
-PXA270_MODULES = "acx g_ether g_file_storage pxa27x_udc bsd_comp \
-                  snd_pcm_oss snd_mixer_oss \
-                  hidp bluetooth bfusb hci_usb \
-                  irtty-sir pxaficp_ir sir-dev \
-                 "     
-
-include conf/machine/include/smartphone-common.conf
+MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
+MACHINE_EXTRA__RRECOMMENDS = "  kernel-module-nls_cp437 \
+                                kernel-module-nls_iso8859-1 \
+                                kernel-module-nls_utf8 \
+                                kernel-module-af_key \
+                               bsd_comp \
+                               i2c-pxa \
+                               htcuniversal_power \
+                               snd-htcuniversal_audio \
+                               htcuniversal_acx \
+                               "
 
 GUI_MACHINE_CLASS = "bigscreen"
 
@@ -35,8 +34,6 @@ include conf/machine/include/tune-xscale.conf
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
 #include conf/machine/include/tune-iwmmxt.conf
 
-UN_MODULES = "i2c-pxa htcuniversal_acx htcuniversal_power snd-htcuniversal_audio"
-
 module_autoload_acx = "acx"
 module_autoload_htcuniversal_acx = "htcuniversal_acx"