summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-06-20 14:13:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-22 17:03:04 +0100
commitaaa4951d8b25591ebf7e98e02d8e7873d082d3e9 (patch)
tree8b482d0dbe154921705ea2d26d49fb9d8a956769 /meta-yocto
parent489fe5d4406410e7eae35ca7ee7be911fac938ec (diff)
downloadast2050-yocto-poky-aaa4951d8b25591ebf7e98e02d8e7873d082d3e9.zip
ast2050-yocto-poky-aaa4951d8b25591ebf7e98e02d8e7873d082d3e9.tar.gz
beagleboard: switch to xserver-xf86-lite
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>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/machine/beagleboard.conf8
-rw-r--r--meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf34
2 files changed, 40 insertions, 2 deletions
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 945744b..fddacf9 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -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
index 0000000..0335e6a
--- /dev/null
+++ b/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf
@@ -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
OpenPOWER on IntegriCloud