summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-06-20 21:13:21 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-22 16:03:04 (GMT)
commitaaa4951d8b25591ebf7e98e02d8e7873d082d3e9 (patch)
tree8b482d0dbe154921705ea2d26d49fb9d8a956769 /meta-yocto
parent489fe5d4406410e7eae35ca7ee7be911fac938ec (diff)
downloadpoky-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 @@
3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board
4TARGET_ARCH = "arm" 4TARGET_ARCH = "arm"
5 5
6PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 6PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite"
7XSERVER = "xserver-kdrive-fbdev" 7XSERVER = "xserver-xf86-lite \
8 xf86-input-evdev \
9 xf86-input-mouse \
10 xf86-video-omapfb \
11 xf86-input-keyboard"
8 12
9# Ship all kernel modules by default 13# Ship all kernel modules by default
10MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" 14MACHINE_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 @@
1Section "Module"
2 Load "extmod"
3 Load "dbe"
4 Load "glx"
5 Load "freetype"
6 Load "type1"
7 Load "record"
8 Load "dri"
9EndSection
10
11Section "Monitor"
12 Identifier "Builtin Default Monitor"
13EndSection
14
15Section "Device"
16 Identifier "Builtin Default fbdev Device 0"
17 Driver "omapfb"
18EndSection
19
20Section "Screen"
21 Identifier "Builtin Default fbdev Screen 0"
22 Device "Builtin Default fbdev Device 0"
23 Monitor "Builtin Default Monitor"
24EndSection
25
26Section "ServerLayout"
27 Identifier "Builtin Default Layout"
28 Screen "Builtin Default fbdev Screen 0"
29EndSection
30
31Section "ServerFlags"
32 Option "DontZap" "0"
33 Option "AutoAddDevices" "False"
34EndSection