summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-06-18 14:01:34 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-26 15:34:40 +0100
commit2a29b7d087c33a26c0b55a3eac7b19d925e6429b (patch)
treeeb352acba58b9f315d265e5fe643a26f582f76e3 /scripts
parentcad078c4d07941b009e8496ae7ea3f3a903442ee (diff)
downloadpoky-2a29b7d087c33a26c0b55a3eac7b19d925e6429b.tar.gz
yocto-bsp: update yocto-bsp xorg.conf templates
The non-x86 qemu machines now require an xorg.conf, change the templates accordingly. Fixes [YOCTO #2559] (From meta-yocto rev: d465c09d8df0e6d210ba8cd3c17549a07a8e134d) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf8
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == "i386" or qemuarch == "x86_64": }} xserver-xf86-config_0.1.bbappend2
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf
index 10a6d9a0bc..13519804bc 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf
@@ -14,7 +14,11 @@ EndSection
14 14
15Section "InputDevice" 15Section "InputDevice"
16 Identifier "Configured Mouse" 16 Identifier "Configured Mouse"
17{{ if qemuarch == "arm" or qemuarch == "powerpc" or qemuarch == "mips": }}
18 Driver "mouse"
19{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
17 Driver "vmmouse" 20 Driver "vmmouse"
21
18 Option "CorePointer" 22 Option "CorePointer"
19 Option "Device" "/dev/input/mice" 23 Option "Device" "/dev/input/mice"
20 Option "Protocol" "ImPS/2" 24 Option "Protocol" "ImPS/2"
@@ -32,7 +36,11 @@ EndSection
32 36
33Section "Device" 37Section "Device"
34 Identifier "Graphics Controller" 38 Identifier "Graphics Controller"
39{{ if qemuarch == "arm" or qemuarch == "powerpc" or qemuarch == "mips": }}
40 Driver "fbdev"
41{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
35 Driver "vmware" 42 Driver "vmware"
43
36EndSection 44EndSection
37 45
38Section "Monitor" 46Section "Monitor"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == "i386" or qemuarch == "x86_64": }} xserver-xf86-config_0.1.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == "i386" or qemuarch == "x86_64": }} xserver-xf86-config_0.1.bbappend
deleted file mode 100644
index d3420e0aea..0000000000
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == "i386" or qemuarch == "x86_64": }} xserver-xf86-config_0.1.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
1THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
2FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"