[oe-commits] Michael 'Mickey' Lauer : htc*.conf: factor out common include file for the msm7xxxx devices
GIT User account
git at amethyst.openembedded.net
Thu Feb 19 01:01:36 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0aa925443d21b2754d1d4b24037ef7ac4bcb2c78
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0aa925443d21b2754d1d4b24037ef7ac4bcb2c78
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date: Thu Feb 19 02:00:01 2009 +0100
htc*.conf: factor out common include file for the msm7xxxx devices
---
conf/machine/htcdiamond.conf | 11 +++--------
conf/machine/htckaiser.conf | 11 +++--------
conf/machine/htcpolaris.conf | 11 +++--------
conf/machine/htcraphael.conf | 11 +++--------
conf/machine/htctitan.conf | 9 ++-------
conf/machine/htcvogue.conf | 11 +++--------
conf/machine/include/htc-msm7.inc | 23 +++++++++++++++++++++++
7 files changed, 40 insertions(+), 47 deletions(-)
diff --git a/conf/machine/htcdiamond.conf b/conf/machine/htcdiamond.conf
index e4b07ea..f4d3874 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 c977ba2..29e3351 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 0afc65a..1473fa4 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 ad43297..b9aa609 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 2882f8d..bcd4ab8 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 7bf0f6d..c067002 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 0000000..3b26e0b
--- /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
+
More information about the Openembedded-commits
mailing list