hx4700: Organize machine settings per logical groups.

diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index e129277..540d0b9 100644 (file)
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -2,25 +2,32 @@
 #@NAME: iPAQ hx47xx
 #@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU
 
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
-
-PREFERRED_VERSION_orinoco-modules = "0.15rc1"
-
-ROOT_FLASH_SIZE = "80"
 
-EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-                         -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-                         -e 256KiB -p"
-
-IMAGE_FSTYPES ?= "jffs2"
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
 
-MODUTILS = "26"        
+# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
+#require conf/machine/include/tune-iwmmxt.conf
 
+ROOT_FLASH_SIZE = "80"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
 
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 PCMCIA_MANAGER = "pcmciautils"
+MODUTILS = "26"        
+XSERVER = "xserver-kdrive-w100"
+
+PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls_cp437 \
@@ -33,20 +40,13 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls_cp437 \
                                kernel-module-snd_hx4700_audio"
 
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
-
-GUI_MACHINE_CLASS = "bigscreen"
-XSERVER = "xserver-kdrive-w100"
-
-# 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
-
+EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+                         -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+                         -e 256KiB -p"
 
-#define which modules to load at boot
+#
+# Modules autoload and other boot properties
+#
 module_autoload_evdev = "evdev"
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"
@@ -63,3 +63,5 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0"