htcuniversal.conf: Update to latest Goxboxlive version.

diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 8ce77e7..0e141e5 100644 (file)
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -1,22 +1,28 @@
 #@TYPE: Machine
 #@NAME: HTC Universal
-#@DESCRIPTION: Machine configuration for the HTC Universal with a pxa27x CPU  devices
+#@DESCRIPTION: Machine configuration for the HTC Universal
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa htcuniversal"
+IPKG_EXTRA_ARCHS = "ipaqpxa htcuniversal"
 #use this for a HTC Universal
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-#PREFERRED_PROVIDER_virtual/kernel = "xanadux-un-2.6"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-un-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
 MODUTILS = "26"        
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
-#BOOTSTRAP_EXTRA_RDEPENDS_append = " udev"
+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"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware"
 
-PXA270_MODULES = "g_ether hidp i2c-core i2c-pxa i2c-sensor"
+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
 
@@ -28,23 +34,12 @@ 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
 
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}"
-UN_MODULES = " htcuniversal_acx acx"
-
+UN_MODULES = "i2c-pxa htcuniversal_acx htcuniversal_power snd-htcuniversal_audio"
 
 #module_autoload_htcuniversal_power = "htcuniversal_power"
-#module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal"
-#module_autoload_snd-pcm-oss = "snd-pcm-oss"
-#module_autoload_snd-mixer-oss = "snd-mixer-oss"
-#module_autoload_firmware-class = "firmware-class"
+#module_autoload_snd-htcuniversal_audio = "snd-htcuniversal_audio"
 module_autoload_acx = "acx"
-module_autoload_htcuniversal-acx = "htcuniversal_acx"
-#module_autoload_htcuniversal-bt = "htcuniversal_bt"
-#module_autoload_htcuniversal-power = "htcuniversal_power"
-
-#module_autoload_pxa27x_udc = "pxa27x_udc"
+module_autoload_htcuniversal_acx = "htcuniversal_acx"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
-
-#GPE_EXTRA_INSTALL += " gomunicator"