merge of 'c8b6f226355d3351327e8b61f52855537a448a23'

     and 'ff788cdac5bbfb991ee004911daf4db1b80ff5ce'

6 files changed, 58 insertions, 33 deletions

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index a1132209ad..4b1aff017a 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -68,7 +68,7 @@ SRCDATE_minimo ?= "20050401"
 SRCDATE_mystun-server ?= "20060814"
 SRCDATE_olsrd ?= "20060814"
 SRCDATE_opencvs ?= "20060814"
-SRCDATE_oprofile ?= "20060214"
+SRCDATE_oprofile ?= "20061011"
 SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 2f21b4ee91..313db8b765 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -2,20 +2,29 @@
 #@NAME: HP iPAQ H1910/H1915
 #@DESCRIPTION: Machine configuration for the HP iPAQ H1910/H1915
 
-KERNEL ?= "kernel26"
-OVERRIDES =. "${KERNEL}:"
-
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
 require conf/machine/include/tune-xscale.conf
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+VOLATILE_STORAGE_SIZE = "64"
+ROOT_FLASH_SIZE = "32"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "udev apm apmd network-suspend-scripts modutils-collateral mtd-utils"
-BOOTSTRAP_EXTRA_RRECOMMENDS += ""
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 EXTRA_IMAGECMD_h1910_jffs2 = "-e 0x4000 -p -n"
 
-GUI_MACHINE_CLASS = "smallscreen"
-
+#
+# Modules autoload and other boot properties
+#
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 467c0c0e81..e3936a794b 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -2,8 +2,9 @@
 #@NAME: HP iPAQ h22xx
 #@DESCRIPTION: Machine configuration for the HP iPAQ h22xx
 
-
+#
 # Hardware-based properties
+#
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
@@ -11,13 +12,16 @@ IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 require conf/machine/include/tune-xscale.conf
 
 #Set some hints for metadata  
+VOLATILE_STORAGE_SIZE = "64"
 ROOT_FLASH_SIZE = "32"
 GUI_MACHINE_CLASS = "smallscreen"
 
 #Set features for task-base 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget"
 
-# Software/package selection
+#
+# Software/packages selection
+#
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
@@ -25,7 +29,9 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel"
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 
+#
 # Modules autoload and other boot properties
+#
 module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 2604b8e8b0..14a9bb6ba5 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -14,6 +14,7 @@ require conf/machine/include/tune-strongarm.conf
 ROOT_FLASH_SIZE = "16"
 # h3630 have 32Mb only
 VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "smallscreen"
 
 #
 # Software/packages selection
@@ -24,9 +25,6 @@ PREFERRED_VERSION_handhelds-sa ?= "2.4.19-rmk6-pxa1-hh42"
 BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}"
 EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
 
-#
-# Modules autoload and other boot properties
-#
 H3600_MODULES = "\
 h3600-asic \
 h3600-micro \
@@ -43,6 +41,9 @@ serial-h3800 \
 usb-char \
 usb-eth"
 
+#
+# Modules autoload and other boot properties
+#
 USE_DEVFS = "1"
 USE_VT = "0"
 
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 17bb47811a..6e6717842d 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -2,22 +2,29 @@
 #@NAME: HP iPAQ h4xxx
 #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx
 
+#
 # Hardware-based properties
+#
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
 require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget"
 
-# Software/package selection
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
+#
 # Modules autoload and other boot properties
+#
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_g_ether = "g_ether"
 
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
index a7208209eb..0e9165903b 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5xxx.conf
@@ -2,30 +2,32 @@
 #@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
 #@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
 
-
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
-EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
 
-ROOT_FLASH_SIZE = "32"
+require conf/machine/include/tune-xscale.conf
 
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost"
 
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
 
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
-MACHINE_EXTRA__RRECOMMENDS = "  \
-				kernel-module-h5400_lcd \
-				kernel-module-h5400_battery \
-				"
-
-
+MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \
+			      kernel-module-h5400_battery"
 
+#
+# Modules autoload and other boot properties
+#
 SERIAL_CONSOLE = "115200 tts/0 vt100"
-
 USE_VT = "0"
-
-GUI_MACHINE_CLASS = "smallscreen"
-
-require conf/machine/include/tune-xscale.conf