summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2006-10-20 20:45:53 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2006-10-20 20:45:53 +0000
commitc079f7f71fce4dab245d339677efc1c8eda214d4 (patch)
treeba67d249614701fed35babddcdb288ff56a74c74 /conf/machine
parent21dcbc25b5a8e67ed7779c94c7f9226e7f5d961c (diff)
htcuniversal: Organize machine settings per logical groups.
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/htcuniversal.conf32
1 files changed, 19 insertions, 13 deletions
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 7c0710d6f1..9add014c93 100644
--- 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"