htcuniversal: Organize machine settings per logical groups.

diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 7c0710d..9add014 100644 (file)
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -2,17 +2,28 @@
 #@NAME: HTC Universal
 #@DESCRIPTION: Machine configuration for the HTC Universal
 
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "ipaqpxa 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"
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
 
+# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
+#require conf/machine/include/tune-iwmmxt.conf
+
+GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen"
 
-MODUTILS = "26"        
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
 MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
@@ -27,14 +38,9 @@ MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
                                kernel-module-acx \
                                "
 
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
-
+#
+# Modules autoload and other boot properties
+#
 module_autoload_acx = "acx"
 module_autoload_htcuniversal_acx = "htcuniversal_acx"