Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

8 files changed, 41 insertions, 48 deletions

diff --git a/conf/machine/htcdiamond.conf b/conf/machine/htcdiamond.conf
index e4b07ea794..f4d3874e7b 100644
--- a/conf/machine/htcdiamond.conf
+++ b/conf/machine/htcdiamond.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
-#@NAME: HTC Diamond phone
-#@DESCRIPTION: Machine configuration for HTC Diamond phone
-require conf/machine/include/tune-arm1136-novfp.inc
+#@NAME: HTC Diamond
+#@DESCRIPTION: Machine configuration for the HTC Diamond smartphone
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-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 usb"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf
index c977ba2eb6..29e33519c7 100644
--- a/conf/machine/htckaiser.conf
+++ b/conf/machine/htckaiser.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
-#@NAME: HTC Kaiser phone
-#@DESCRIPTION: Machine configuration for HTC Kaiser phone (aka HTC TyTN II)
-require conf/machine/include/tune-arm1136-novfp.inc
+#@NAME: HTC Kaiser
+#@DESCRIPTION: Machine configuration for the HTC Kaiser smartphone (aka HTC TyTN II)
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-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 keyboard phone gps"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htcpolaris.conf b/conf/machine/htcpolaris.conf
index 0afc65a198..1473fa4a34 100644
--- a/conf/machine/htcpolaris.conf
+++ b/conf/machine/htcpolaris.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
-#@NAME: HTC Polaris phone
-#@DESCRIPTION: Machine configuration for HTC Polaris phone
-require conf/machine/include/tune-arm1136-novfp.inc
+#@NAME: HTC Polaris
+#@DESCRIPTION: Machine configuration for the HTC Polaris smartphone
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-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"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htcraphael.conf b/conf/machine/htcraphael.conf
index ad4329714d..b9aa609bf1 100644
--- a/conf/machine/htcraphael.conf
+++ b/conf/machine/htcraphael.conf
@@ -1,15 +1,10 @@
 #@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
+#@NAME: HTC Raphael
+#@DESCRIPTION: Machine configuration for HTC Raphael smartphone (aka HTC Touch Pro)
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-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 usb keyboard"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htctitan.conf b/conf/machine/htctitan.conf
index 2882f8d4d7..bcd4ab8795 100644
--- a/conf/machine/htctitan.conf
+++ b/conf/machine/htctitan.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
 #@NAME: HTC Titan phone
-#@DESCRIPTION: Machine configuration for HTC Titan phone
-require conf/machine/include/tune-arm1136-novfp.inc
+#@DESCRIPTION: Machine configuration for HTC Titan smartphone
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-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 keyboard"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htcvogue.conf b/conf/machine/htcvogue.conf
index 7bf0f6d0b8..c0670024a4 100644
--- a/conf/machine/htcvogue.conf
+++ b/conf/machine/htcvogue.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
-#@NAME: HTC Vogue phone
-#@DESCRIPTION: Machine configuration for HTC Vogue phone
-require conf/machine/include/tune-arm1136-novfp.inc
+#@NAME: HTC Vogue
+#@DESCRIPTION: Machine configuration for HTC Vogue smartphone
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-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/htc-msm7.inc b/conf/machine/include/htc-msm7.inc
new file mode 100644
index 0000000000..3b26e0be35
--- /dev/null
+++ b/conf/machine/include/htc-msm7.inc
@@ -0,0 +1,23 @@
+# kernel
+PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+
+# xserver
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+# capability database
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+
+# use this for overrides
+MACHINE_CLASS = "htc-msm7"
+
+# features
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard"
+
+# filesystems
+IMAGE_FSTYPES = "tar.gz cpio.gz"
+
+# CPU
+require conf/machine/include/tune-arm1136-novfp.inc
+
diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf
index a00a9b1be3..a1a5212ee9 100644
--- a/conf/machine/mx31moboard.conf
+++ b/conf/machine/mx31moboard.conf
@@ -20,7 +20,7 @@ module_conf_g_ether = "alias usb0 g_ether"
 module_conf_rt2570-k2wrlz = "alias rausb0 rt2570"
 
 # tinylogin is broken for our speeds
-DISTRO_LOGIN_MANAGER = "busybox"
+IMAGE_LOGIN_MANAGER = "busybox"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "-Lh 921600 ttymxc0 vt100"