diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 12:55:19 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:13 +0200 |
| commit | 34b8f63ea1aa0941f11c6c032f8e1716269a0449 (patch) | |
| tree | 7eff96e68ac2402f6f95236aea715d75d35ccc63 | |
| parent | 7b2478956a1aece1c79ece8dec250ed91c09903b (diff) | |
| download | qemu-34b8f63ea1aa0941f11c6c032f8e1716269a0449.tar.gz | |
hw: move audio devices to hw/audio/, configure via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/arm-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/sparc-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/arm/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/audio/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/audio/cs4231.c (renamed from hw/cs4231.c) | 0 | ||||
| -rw-r--r-- | hw/audio/marvell_88w8618.c (renamed from hw/marvell_88w8618_audio.c) | 0 | ||||
| -rw-r--r-- | hw/audio/milkymist-ac97.c (renamed from hw/milkymist-ac97.c) | 0 | ||||
| -rw-r--r-- | hw/lm32/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/sparc/Makefile.objs | 2 |
9 files changed, 8 insertions, 3 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 7717ea6672..c0e011084b 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -48,6 +48,7 @@ CONFIG_PL310=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_XGMAC=y +CONFIG_MARVELL_88W8618=y CONFIG_ONENAND=y CONFIG_VERSATILE_PCI=y diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index 6d11ba0369..eda8797662 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -9,3 +9,4 @@ CONFIG_FDC=y CONFIG_EMPTY_SLOT=y CONFIG_PCNET_COMMON=y CONFIG_LANCE=y +CONFIG_CS4231=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index ede019da02..6582f5a0aa 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -19,7 +19,7 @@ obj-y += omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ obj-y += tsc210x.o obj-y += blizzard.o cbus.o tusb6010.o obj-y += mst_fpga.o -obj-y += bitbang_i2c.o marvell_88w8618_audio.o +obj-y += bitbang_i2c.o obj-y += framebuffer.o obj-y += strongarm.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o diff --git a/hw/audio/Makefile.objs b/hw/audio/Makefile.objs index c50c367da7..237510204b 100644 --- a/hw/audio/Makefile.objs +++ b/hw/audio/Makefile.objs @@ -13,4 +13,8 @@ common-obj-$(CONFIG_PCSPK) += pcspk.o common-obj-$(CONFIG_WM8750) += wm8750.o common-obj-$(CONFIG_PL041) += pl041.o lm4549.o +common-obj-$(CONFIG_CS4231) += cs4231.o +common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o +common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o + $(obj)/adlib.o $(obj)/fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 diff --git a/hw/cs4231.c b/hw/audio/cs4231.c index 2975336057..2975336057 100644 --- a/hw/cs4231.c +++ b/hw/audio/cs4231.c diff --git a/hw/marvell_88w8618_audio.c b/hw/audio/marvell_88w8618.c index f9b68fd311..f9b68fd311 100644 --- a/hw/marvell_88w8618_audio.c +++ b/hw/audio/marvell_88w8618.c diff --git a/hw/milkymist-ac97.c b/hw/audio/milkymist-ac97.c index e08e9dca16..e08e9dca16 100644 --- a/hw/milkymist-ac97.c +++ b/hw/audio/milkymist-ac97.c diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index d72756c877..e328ec8400 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -4,7 +4,6 @@ obj-y += lm32_juart.o obj-y += lm32_timer.o obj-y += lm32_uart.o obj-y += lm32_sys.o -obj-y += milkymist-ac97.o obj-y += milkymist-hpdmc.o obj-y += milkymist-memcard.o obj-y += milkymist-pfpu.o diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index 56eeb9012b..b2a921e7e1 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1,6 +1,6 @@ obj-y = tcx.o sun4m_iommu.o slavio_intctl.o obj-y += slavio_timer.o slavio_misc.o sparc32_dma.o -obj-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o +obj-y += eccmemctl.o sbi.o sun4c_intctl.o # GRLIB obj-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o |