htcuniversal.conf: unbreak it

diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 0e141e5..b346c52 100644 (file)
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -3,13 +3,14 @@
 #@DESCRIPTION: Machine configuration for the HTC Universal
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "ipaqpxa htcuniversal"
+IPKG_EXTRA_ARCHS = "ipaqpxa arm armv4t armv5te iwmmxt"
+
 #use this for a HTC Universal
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+XSERVER = "xserver-kdrive-fbdev"
 
 MODUTILS = "26"        
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel "
 BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${UN_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev"
@@ -19,10 +20,8 @@ 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 \
-                  pppoe pppox \
                   irtty-sir pxaficp_ir sir-dev \
-                  fuse smbfs"
-
+                 "     
 
 include conf/machine/include/smartphone-common.conf
 
@@ -36,8 +35,6 @@ include conf/machine/include/tune-xscale.conf
 
 UN_MODULES = "i2c-pxa htcuniversal_acx htcuniversal_power snd-htcuniversal_audio"
 
-#module_autoload_htcuniversal_power = "htcuniversal_power"
-#module_autoload_snd-htcuniversal_audio = "snd-htcuniversal_audio"
 module_autoload_acx = "acx"
 module_autoload_htcuniversal_acx = "htcuniversal_acx"