summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-08 08:01:32 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-08 08:01:48 +0200
commit3636773aa5bf863f35ca561a44e595fadb2194e2 (patch)
tree1304dd33fa4df60bc1ce0d19679966c4fce61ebd /target
parent488db3d5e0f0dc3c7c8c968e81aa3a1107c459bf (diff)
enable audio support for qemu-x86/qemu-x86_64
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.qemuopts12
-rw-r--r--target/linux/config/Config.in.audio5
-rw-r--r--target/x86/Makefile4
-rw-r--r--target/x86_64/Makefile4
4 files changed, 23 insertions, 2 deletions
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index e93f4d4b6..ffb48946c 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -96,4 +96,16 @@ config ADK_TARGET_QEMU_WITH_VIRTIO
select ADK_KERNEL_VIRTIO_BLK
endchoice
+
+choice
+prompt "Qemu Emulation with audio support"
+depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
+
+config ADK_TARGET_QEMU_WITHOUT_AUDIO
+ boolean "disabled"
+
+config ADK_TARGET_QEMU_WITH_AUDIO
+ boolean "enabled"
+
+endchoice
endmenu
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 5b6777c95..0e2c760d4 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -82,10 +82,11 @@ config ADK_KERNEL_SND_INTEL8X0
select ADK_KERNEL_SND_PCI
select ADK_KERNEL_SND_AC97_CODEC
default m if ADK_TARGET_SYSTEM_IBM_X40
+ default m if ADK_TARGET_QEMU_WITH_AUDIO
default n
- depends on ADK_TARGET_WITH_PCI
+ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU
help
- Driver for intel chipsets.
+ Driver for intel chipsets.
config ADK_KERNEL_SND_VIA82XX
prompt "VIA82XX driver"
diff --git a/target/x86/Makefile b/target/x86/Makefile
index a4d3ee58c..7fdd3a0cd 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -14,6 +14,10 @@ QEMU_ARGS:=-M pc
QEMU_ARGS+=${ADK_QEMU_ARGS}
QEMU_ARGS+=-net user -net nic,model=e1000
+ifeq ($(ADK_TARGET_QEMU_WITH_AUDIO),y)
+QEMU_ARGS+=-soundhw ac97
+endif
+
ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y)
CREATE:=./scripts/create.sh -g -t
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index e49d23029..89de6fe04 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -14,6 +14,10 @@ QEMU_ARGS:=-M pc
QEMU_ARGS+=${ADK_QEMU_ARGS}
QEMU_ARGS+=-net user -net nic,model=e1000
+ifeq ($(ADK_TARGET_QEMU_WITH_AUDIO),y)
+QEMU_ARGS+=-soundhw ac97
+endif
+
ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y)
CREATE:=./scripts/create.sh -g -t