[oe-commits] Martin Jansa : shr: put shr overrides directly to machine configs

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: d1c6527dceaea11f99aed65784528b63c9035a4e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d1c6527dceaea11f99aed65784528b63c9035a4e

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Wed Nov 11 07:17:47 2009 +0000

shr: put shr overrides directly to machine configs

---

 conf/distro/include/shr-om-gta01.conf |   10 ----------
 conf/distro/include/shr-om-gta02.conf |   12 ------------
 conf/distro/shr.conf                  |    4 ----
 conf/machine/om-gta01.conf            |    9 +++++++++
 conf/machine/om-gta02.conf            |   12 ++++++++++++
 5 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/conf/distro/include/shr-om-gta01.conf b/conf/distro/include/shr-om-gta01.conf
deleted file mode 100644
index 4aff7e4..0000000
--- a/conf/distro/include/shr-om-gta01.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# SHR-specific overrides to the machine.conf file
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_xf86-video-fbdev = "xf86-video-fbdev"
-PREFERRED_PROVIDER_mesa = "mesa"
-PREFERRED_PROVIDER_drm = "libdrm"
-
-XSERVER = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
-
-
diff --git a/conf/distro/include/shr-om-gta02.conf b/conf/distro/include/shr-om-gta02.conf
deleted file mode 100644
index 7252a5b..0000000
--- a/conf/distro/include/shr-om-gta02.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# SHR-specific overrides to the machine.conf file
-
-# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
-#PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
-MACHINE_DRI_MODULES = "glamo"
-
-XSERVER = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
-
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 34da605..183f17c 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -15,10 +15,6 @@ TOOLCHAIN_BRAND ?= ""
 
 #LIBC = "glibc"
 
-# We need to override some machine stuff as well; include the machine-
-# specific file here (if it exists).
-include conf/distro/include/shr-${MACHINE}.conf
-
 require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
 require conf/distro/include/preferred-shr-versions.inc
 require conf/distro/include/shr-autorev.inc
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 4aede6a..1bf3f48 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -7,6 +7,15 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
+
+# SHR-specific overrides to the machine.conf file
+PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
+PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
+PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev"
+PREFERRED_PROVIDER_mesa_shr = "mesa"
+XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
+
+
 UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index fe7220a..fe8ca8f 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -8,6 +8,18 @@ TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-stable"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive-glamo"
+
+# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel
+PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
+#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel"
+#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
+
+PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
+MACHINE_DRI_MODULES_shr = "glamo"
+
+XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
+
 UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"