merge of '0e37e6d3147e19d5d8fd54b3596f8b3527e4be92'

     and '98d02c14c4d2e08f3fe03f716c9fa5b128b351a4'

4 files changed, 71 insertions, 2 deletions

diff --git a/conf/machine/eteng500.conf b/conf/machine/eteng500.conf
new file mode 100644
index 0000000000..59eafda6f2
--- /dev/null
+++ b/conf/machine/eteng500.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: Eten G500
+#@DESCRIPTION: Machine configuration for the Eten G500 PocketPC phone
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
+
+# Samsung S3C2xxx CPU
+require conf/machine/include/tune-arm920t.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index e81dbdeaa9..574e10fae0 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 require conf/machine/include/tune-xscale.conf
 
 VOLATILE_STORAGE_SIZE = "64"
-ROOT_FLASH_SIZE = "32"
+ROOT_FLASH_SIZE = "16"
 GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
 
diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf
new file mode 100644
index 0000000000..097ee9c017
--- /dev/null
+++ b/conf/machine/rx1950.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: HP iPAQ rx1950
+#@DESCRIPTION: Machine configuration for the HP iPAQ rx1950
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
+
+# Samsung S3C2xxx CPU
+require conf/machine/include/tune-arm920t.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
index cc544ef7b1..0506a1f083 100644
--- a/conf/machine/rx3000.conf
+++ b/conf/machine/rx3000.conf
@@ -20,7 +20,6 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.18-hh2"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"