6 files changed, 67 insertions, 27 deletions
diff --git a/conf/machine/htcdiamond.conf b/conf/machine/htcdiamond.conf
new file mode 100644
index 0000000000..393c1ee87b
--- /dev/null
+++ b/conf/machine/htcdiamond.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: HTC Diamond phone
+#@DESCRIPTION: Machine configuration for HTC Diamond phone
+require conf/machine/include/tune-arm1136-novfp.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps"
+
+IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf
index 1d6cde4536..c977ba2eb6 100644
--- a/conf/machine/htckaiser.conf
+++ b/conf/machine/htckaiser.conf
@@ -1,20 +1,15 @@
 #@TYPE: Machine
 #@NAME: HTC Kaiser phone
-#@DESCRIPTION: Machine configuration for HTC Kaiser phone
-TARGET_ARCH = "arm"
- 
+#@DESCRIPTION: Machine configuration for HTC Kaiser phone (aka HTC TyTN II)
+require conf/machine/include/tune-arm1136-novfp.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
- 
-GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
- 
-require conf/machine/include/tune-arm1136jf-s.inc
 
-IMAGE_FSTYPES ?= "tar.gz cpio.gz"
- 
-PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser"
- 
-MACHINE_FEATURES = "kernel26 touchscreen screen keyboard"
+MACHINE_FEATURES = "kernel26 touchscreen screen keyboard phone gps"
 
+IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htcpolaris.conf b/conf/machine/htcpolaris.conf
index e2fc46889e..0afc65a198 100644
--- a/conf/machine/htcpolaris.conf
+++ b/conf/machine/htcpolaris.conf
@@ -1,23 +1,15 @@
 #@TYPE: Machine
 #@NAME: HTC Polaris phone
 #@DESCRIPTION: Machine configuration for HTC Polaris phone
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
- 
+require conf/machine/include/tune-arm1136-novfp.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
- 
-GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
- 
-TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
-FEED_ARCH = "armv6"
-BASE_PACKAGE_ARCH = "armv6"
- 
 
-IMAGE_FSTYPES ?= "tar.gz cpio.gz"
- 
-PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser"
- 
-MACHINE_FEATURES = "kernel26 touchscreen screen keyboard bluetooth"
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps"
+
+IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htcraphael.conf b/conf/machine/htcraphael.conf
new file mode 100644
index 0000000000..3ab87be48c
--- /dev/null
+++ b/conf/machine/htcraphael.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: HTC Raphael phone
+#@DESCRIPTION: Machine configuration for HTC Raphael phone (aka HTC Touch Pro)
+require conf/machine/include/tune-arm1136-novfp.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+
+MACHINE_FEATURES = "kernel26 touchscreen screen keyboard phone gps"
+
+IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htcvogue.conf b/conf/machine/htcvogue.conf
new file mode 100644
index 0000000000..7bf0f6d0b8
--- /dev/null
+++ b/conf/machine/htcvogue.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: HTC Vogue phone
+#@DESCRIPTION: Machine configuration for HTC Vogue phone
+require conf/machine/include/tune-arm1136-novfp.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps camera"
+
+IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/include/tune-arm1136-novfp.inc b/conf/machine/include/tune-arm1136-novfp.inc
new file mode 100644
index 0000000000..372148e7a2
--- /dev/null
+++ b/conf/machine/include/tune-arm1136-novfp.inc
@@ -0,0 +1,8 @@
+TARGET_ARCH = "arm"
+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
+
+# Not all kernels enable floating point emulation in the kernel, so we exclude 'armv6' for now
+FEED_ARCH = "armv6-novfp"
+BASE_PACKAGE_ARCH = "armv6-novfp"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6-novfp"
+