summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf22
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb2
-rwxr-xr-xscripts/poky-qemu-internal11
3 files changed, 27 insertions, 8 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
index 50fd7b4797..7f5bfa70ea 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
+++ b/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
@@ -21,6 +21,14 @@ Section "InputDevice"
21 Option "Emulate3Buttons" "true" 21 Option "Emulate3Buttons" "true"
22EndSection 22EndSection
23 23
24Section "InputDevice"
25 Identifier "Qemu Tablet"
26 Driver "evdev"
27 Option "CorePointer"
28 Option "Device" "/dev/input/touchscreen0"
29 Option "USB" "on"
30EndSection
31
24Section "Device" 32Section "Device"
25 Identifier "Graphics Controller" 33 Identifier "Graphics Controller"
26 Driver "vmware" 34 Driver "vmware"
@@ -31,6 +39,14 @@ Section "Monitor"
31 Option "DPMS" 39 Option "DPMS"
32 # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz 40 # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
33 Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync 41 Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync
42 # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
43 ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync
44 # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
45 ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync
46 # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
47 ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync
48 # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
49 ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync
34EndSection 50EndSection
35 51
36Section "Screen" 52Section "Screen"
@@ -39,7 +55,7 @@ Section "Screen"
39 Monitor "Generic Monitor" 55 Monitor "Generic Monitor"
40 DefaultDepth 24 56 DefaultDepth 24
41 SubSection "Display" 57 SubSection "Display"
42 Modes "1024x600_60.00" 58 Modes "640x480"
43 EndSubSection 59 EndSubSection
44EndSection 60EndSection
45 61
@@ -47,7 +63,7 @@ Section "ServerLayout"
47 Identifier "Default Layout" 63 Identifier "Default Layout"
48 Screen "Default Screen" 64 Screen "Default Screen"
49 InputDevice "Generic Keyboard" 65 InputDevice "Generic Keyboard"
50 InputDevice "Configured Mouse" 66 # InputDevice "Configured Mouse"
67 InputDevice "QEMU Tablet"
51 Option "AllowEmptyInput" "no" 68 Option "AllowEmptyInput" "no"
52EndSection 69EndSection
53
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb
index 80c3a28576..2089e26a63 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "X.Org X server configuration file"
2HOMEPAGE = "http://www.x.org" 2HOMEPAGE = "http://www.x.org"
3SECTION = "x11/base" 3SECTION = "x11/base"
4LICENSE = "MIT-X" 4LICENSE = "MIT-X"
5PR = "r6" 5PR = "r7"
6 6
7SRC_URI = "file://xorg.conf" 7SRC_URI = "file://xorg.conf"
8 8
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index 7dd52371b6..11178a7b50 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -48,6 +48,7 @@ KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0"
48QEMU_TAP_CMD="-net tap,vlan=0,ifname=tap0,script=$QEMUIFUP,downscript=$QEMUIFDOWN" 48QEMU_TAP_CMD="-net tap,vlan=0,ifname=tap0,script=$QEMUIFUP,downscript=$QEMUIFDOWN"
49QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD" 49QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD"
50KERNCMDLINE="mem=$QEMU_MEMORY" 50KERNCMDLINE="mem=$QEMU_MEMORY"
51QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
51 52
52SERIALOPTS="" 53SERIALOPTS=""
53if [ "x$SERIAL_LOGFILE" != "x" ]; then 54if [ "x$SERIAL_LOGFILE" != "x" ]; then
@@ -81,9 +82,10 @@ fi
81 82
82if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then 83if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
83 QEMU=qemu-system-arm 84 QEMU=qemu-system-arm
85 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer"
84 if [ "$TYPE" = "ext3" ]; then 86 if [ "$TYPE" = "ext3" ]; then
85 KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 87 KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
86 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot -force-pointer -show-cursor" 88 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -no-reboot $QEMU_UI_OPTIONS"
87 fi 89 fi
88 if [ "$TYPE" = "nfs" ]; then 90 if [ "$TYPE" = "nfs" ]; then
89 if [ "x$HDIMAGE" = "x" ]; then 91 if [ "x$HDIMAGE" = "x" ]; then
@@ -94,7 +96,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
94 return 96 return
95 fi 97 fi
96 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 98 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
97 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -usb -usbdevice wacom-tablet -no-reboot -force-pointer -show-cursor" 99 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb --no-reboot $QEMU_UI_OPTIONS"
98 fi 100 fi
99 if [ "$MACHINE" = "qemuarmv6" ]; then 101 if [ "$MACHINE" = "qemuarmv6" ]; then
100 QEMUOPTIONS="$QEMUOPTIONS -cpu arm1136" 102 QEMUOPTIONS="$QEMUOPTIONS -cpu arm1136"
@@ -106,9 +108,10 @@ fi
106 108
107if [ "$MACHINE" = "qemux86" ]; then 109if [ "$MACHINE" = "qemux86" ]; then
108 QEMU=qemu 110 QEMU=qemu
111 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl"
109 if [ "$TYPE" = "ext3" ]; then 112 if [ "$TYPE" = "ext3" ]; then
110 KERNCMDLINE="vga=0 root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 113 KERNCMDLINE="vga=0 root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
111 QEMUOPTIONS="-vga vmware -show-cursor $QEMU_NETWORK_CMD -hda $HDIMAGE -enable-gl" 114 QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $HDIMAGE $QEMU_UI_OPTIONS"
112 fi 115 fi
113 if [ "$TYPE" = "nfs" ]; then 116 if [ "$TYPE" = "nfs" ]; then
114 if [ "x$HDIMAGE" = "x" ]; then 117 if [ "x$HDIMAGE" = "x" ]; then
@@ -119,7 +122,7 @@ if [ "$MACHINE" = "qemux86" ]; then
119 return 122 return
120 fi 123 fi
121 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 124 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
122 QEMUOPTIONS="-vga vmware -show-cursor $QEMU_NETWORK_CMD -enable-gl" 125 QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS"
123 fi 126 fi
124fi 127fi
125 128