]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
beagleboard: switch to xserver-xf86-lite
authorDarren Hart <dvhart@linux.intel.com>
Mon, 20 Jun 2011 21:13:21 +0000 (14:13 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 22 Jun 2011 16:03:04 +0000 (17:03 +0100)
Try to get closer to the meta-texasinstruments layer which uses
xserver-xorg. Provide a default xorg.conf that matches the one
from meta-texasinstruments.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
meta-yocto/conf/machine/beagleboard.conf
meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf [new file with mode: 0644]

index 945744bc07b083e25b473de875aa0f4f651a813f..fddacf92e9407faad5f76cd50319b9328a9aed95 100644 (file)
@@ -3,8 +3,12 @@
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite"
+XSERVER = "xserver-xf86-lite \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
 
 # Ship all kernel modules by default
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf b/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf
new file mode 100644 (file)
index 0000000..0335e6a
--- /dev/null
@@ -0,0 +1,34 @@
+Section "Module"
+       Load    "extmod"
+       Load    "dbe"
+       Load    "glx"
+       Load    "freetype"
+       Load    "type1"
+       Load    "record"
+       Load    "dri"
+EndSection
+
+Section "Monitor"
+       Identifier      "Builtin Default Monitor"
+EndSection
+
+Section "Device"
+       Identifier      "Builtin Default fbdev Device 0"
+       Driver          "omapfb"
+EndSection
+
+Section "Screen"
+       Identifier      "Builtin Default fbdev Screen 0"
+       Device          "Builtin Default fbdev Device 0"
+       Monitor         "Builtin Default Monitor"
+EndSection
+
+Section "ServerLayout"
+       Identifier      "Builtin Default Layout"
+       Screen          "Builtin Default fbdev Screen 0"
+EndSection
+
+Section "ServerFlags"
+       Option          "DontZap"  "0"
+        Option         "AutoAddDevices" "False"
+EndSection