merge of '0fc95be78cc0959135ca79a4ec38a38f14160eef'

     and '4ed12f8853fc35aaa445b675fde2edc9d8b0f0ab'

7 files changed, 180 insertions, 3 deletions

diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf
new file mode 100644
index 0000000000..e7a46fed67
--- /dev/null
+++ b/conf/machine/asus620.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: Asus MyPal A620
+#@DESCRIPTION: Machine configuration for the Asus MyPal A620
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+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 irda bluetooth 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_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index 0d7e12e3cc..1bd08e13ab 100644
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: Axim x50/x50v/x51/x51v
-#@DESCRIPTION: Machine configuration for the Dell Axim x50/51(v) with a pxa27x CPU
+#@NAME: Axim x50/x51
+#@DESCRIPTION: Machine configuration for the Dell Axim x50/x51 with a pxa27x CPU
 
 #
 # Hardware-based properties
@@ -16,7 +16,7 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "256"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "bigscreen" # caveat: only "v" models are VGA
+GUI_MACHINE_CLASS ?= "smallscreen"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
 
 #
diff --git a/conf/machine/aximx50v.conf b/conf/machine/aximx50v.conf
new file mode 100644
index 0000000000..9b38da782e
--- /dev/null
+++ b/conf/machine/aximx50v.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: Axim x50v/x51v
+#@DESCRIPTION: Machine configuration for the Dell Axim x50v/x51v with a pxa27x CPU
+
+require conf/machine/aximx50.conf
+
+GUI_MACHINE_CLASS = "bigscreen"
diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf
new file mode 100644
index 0000000000..181e54de5d
--- /dev/null
+++ b/conf/machine/htcalpine.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: HTC Alpine
+#@DESCRIPTION: Machine configuration for the HTC Alpine
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+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 irda bluetooth 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_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf
new file mode 100644
index 0000000000..0906b0f682
--- /dev/null
+++ b/conf/machine/htcapache.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: HTC Apache
+#@DESCRIPTION: Machine configuration for the HTC Apache
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+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 irda bluetooth 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_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf
new file mode 100644
index 0000000000..872942e17a
--- /dev/null
+++ b/conf/machine/htcsable.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: HTC Sable
+#@DESCRIPTION: Machine configuration for the HTC Sable device
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+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 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"
+
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf
new file mode 100644
index 0000000000..ad195b9436
--- /dev/null
+++ b/conf/machine/looxc550.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: Loox C550
+#@DESCRIPTION: Machine configuration for the Loox C550
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+require conf/machine/include/tune-xscale.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth 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_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf