aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xorg-xserver
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-07-15 14:06:01 +0400
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-07-15 14:06:01 +0400
commita210c4ac3cfccacb34381171dc1d9080653d9c6c (patch)
tree87d84094e102d58aafbf398411d16eed84ef1bb0 /recipes/xorg-xserver
parentc10e9906a2ecea7e9c04bf967a8882d6b4cd1077 (diff)
parent3ab9b8af4363fe9029e134268b47c3b34cc54baf (diff)
downloadopenembedded-a210c4ac3cfccacb34381171dc1d9080653d9c6c.tar.gz
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf29
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf_0.1.bb2
2 files changed, 30 insertions, 1 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf
new file mode 100644
index 0000000000..983bb0823a
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf
@@ -0,0 +1,29 @@
+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
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 67fc683090..90fbb1a8f4 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r5"
+PR = "r6"
SRC_URI = "file://xorg.conf"