aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2009-12-16 09:23:35 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2009-12-16 09:23:35 +0100
commit3e97c5a64ca8b15ad0403d87175af060cbaa6f9c (patch)
treea926b595021c5ddfad2b09867d0db03735f8d6cd
parent5452b155e112c43887c009f633b36ce72e2adf35 (diff)
downloadopenembedded-3e97c5a64ca8b15ad0403d87175af060cbaa6f9c.tar.gz
om-gta0(1|2): set virtual/libgl provider without shr override
-rw-r--r--conf/machine/om-gta01.conf2
-rw-r--r--conf/machine/om-gta02.conf4
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 5bdeba01f3..e1c5127072 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
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"
+PREFERRED_PROVIDER_virtual/libgl = "mesa"
XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
UBOOT_ENTRYPOINT = "30008000"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 5fc96ec4ed..8e8355ba6f 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -15,8 +15,8 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-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"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
+MACHINE_DRI_MODULES = "glamo"
XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"