diff options
| author |   Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
| commit | 4ee358534793381d2e87b01781079a3354fd5c1c (patch) | |
| tree | 729f8b0ce4bdbcd8a16f561fb68da0d66c3a3eb8 /recipes/xorg-xserver | |
| parent | beb17e26ee9b4bc0cf334c3b30560c6eb66b1299 (diff) | |
| parent | eda06ec3dde6169a46797f876a82499c4fff8f62 (diff) | |
| download | openembedded-testing_2010-09-13.tar.gz | |
Merge branch 'org.openembedded.dev' into testing-nexttesting_2010-09-13
Diffstat (limited to 'recipes/xorg-xserver')
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf | 51 | ||||
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf | 44 | ||||
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg-conf_0.1.bb | 2 |
3 files changed, 96 insertions, 1 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf new file mode 100644 index 0000000000..356bc9fafc --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf @@ -0,0 +1,51 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Default Monitor" +EndSection + +Section "Device" + Identifier "Default omapfb Device" + Driver "omapfb" +EndSection + +Section "InputDevice" + Identifier "Power Button" + Driver "evdev" + Option "Device" "/dev/input/event0" +EndSection + +Section "InputDevice" + Identifier "Keyboard" + Driver "evdev" + Option "Device" "/dev/input/event1" + Option "XkbModel" "nokiarx51" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Touchscreen" + Driver "evdev" + Option "Device" "/dev/input/event3" +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Default omapfb Device" +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Touchscreen" + InputDevice "Power Button" + InputDevice "Keyboard" +EndSection diff --git a/recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf new file mode 100644 index 0000000000..87001f065e --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf @@ -0,0 +1,44 @@ +Section "Module" + Load "extmod" + Load "dbe" + 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" + Option "fb" "/dev/fb0" +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" + InputDevice "Touchscreen" "CorePointer" +EndSection + +Section "InputDevice" + Identifier "Touchscreen" + Driver "tslib" + Option "Device" "/dev/touchscreen" + Option "CorePointer" "true" + Option "SendCoreEvents" "true" + Option "Protocol" "Auto" + Option "Width" "320" + Option "Height" "480" + Option "EmulateRightButton" "1" + Option "CorePointer" "true" +EndSection + diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index c15bae6536..df03f1bb2e 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 = "r31" +PR = "r33" SRC_URI = "file://xorg.conf" |