summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
-rwxr-xr-xscripts/poky-qemu7
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 33c2c7149a..2c6b11465f 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://qemu.org"
3LICENSE = "GPLv2 & LGPLv2.1" 3LICENSE = "GPLv2 & LGPLv2.1"
4DEPENDS = "zlib" 4DEPENDS = "zlib"
5 5
6EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-linux-user,i386-softmmu,x86_64-linux-user,x86_64-softmmu,mips-linux-user,mips-softmmu,ppc-linux-user,ppc-softmmu,mipsel-linux-user --disable-werror --disable-vnc-tls --enable-kvm" 6EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-linux-user,i386-softmmu,x86_64-linux-user,x86_64-softmmu,mips-linux-user,mips-softmmu,ppc-linux-user,ppc-softmmu,mipsel-linux-user --disable-werror --disable-vnc-tls --enable-kvm --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370"
7#EXTRA_OECONF += "--disable-sdl" 7#EXTRA_OECONF += "--disable-sdl"
8 8
9inherit autotools 9inherit autotools
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index b19a89ddab..cb08f27121 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -129,6 +129,13 @@ while [ $i -le $# ]; do
129 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -serial stdio" 129 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -serial stdio"
130 SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0" 130 SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
131 ;; 131 ;;
132 "audio")
133 if [[ "x$MACHINE" == "xqemux86" || "x$MACHINE" == "xqemux86-64" ]]; then
134 echo "Enable audio on qemu. Pls. install snd_intel8x0 or snd_ens1370 driver in linux guest.";
135 QEMU_AUDIO_DRV="alsa"
136 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -soundhw ac97,es1370"
137 fi
138 ;;
132 "kvm") 139 "kvm")
133 KVM_ENABLED="yes" 140 KVM_ENABLED="yes"
134 KVM_CAPABLE=`grep 'vmx\|smx' /proc/cpuinfo` 141 KVM_CAPABLE=`grep 'vmx\|smx' /proc/cpuinfo`