[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/35] hw: move audio devices to hw/audio/, configur
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 15/35] hw: move audio devices to hw/audio/, configure via default-configs/ |
Date: |
Mon, 18 Mar 2013 18:35:05 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/arm-softmmu.mak | 1 +
default-configs/sparc-softmmu.mak | 1 +
hw/arm/Makefile.objs | 2 +-
hw/audio/Makefile.objs | 4 ++++
hw/{ => audio}/cs4231.c | 0
hw/{marvell_88w8618_audio.c => audio/marvell_88w8618.c} | 0
hw/{ => audio}/milkymist-ac97.c | 0
hw/lm32/Makefile.objs | 1 -
hw/sparc/Makefile.objs | 2 +-
9 files changed, 8 insertions(+), 3 deletions(-)
rename hw/{ => audio}/cs4231.c (100%)
rename hw/{marvell_88w8618_audio.c => audio/marvell_88w8618.c} (100%)
rename hw/{ => audio}/milkymist-ac97.c (100%)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 7717ea6..c0e0110 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 6d11ba0..eda8797 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 ede019d..6582f5a 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 c50c367..2375102 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
similarity index 100%
rename from hw/cs4231.c
rename to hw/audio/cs4231.c
diff --git a/hw/marvell_88w8618_audio.c b/hw/audio/marvell_88w8618.c
similarity index 100%
rename from hw/marvell_88w8618_audio.c
rename to hw/audio/marvell_88w8618.c
diff --git a/hw/milkymist-ac97.c b/hw/audio/milkymist-ac97.c
similarity index 100%
rename from hw/milkymist-ac97.c
rename to hw/audio/milkymist-ac97.c
diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs
index b0f8a9f..9634226 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 56eeb90..b2a921e 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
--
1.8.1.4
- [Qemu-devel] [PATCH 00/35] hw/ reorganization, part 2, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 05/35] hw: move another file to hw/alpha/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 12/35] hw: move MC146818RTC to hw/timer/, configure via default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 13/35] hw: move NICs to hw/net/, configure via default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 15/35] hw: move audio devices to hw/audio/, configure via default-configs/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 14/35] hw: move block devices to hw/block/, configure via default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 17/35] hw: move I2C controllers to hw/i2c/, configure via default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 18/35] hw: move SSI controllers to hw/ssi/, configure via default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 16/35] hw: move display devices to hw/display/, configure via default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 19/35] hw: move SCSI controllers to hw/scsi/, configure via default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 20/35] hw: move more files to hw/xen/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 22/35] hw: move ISA bridges and devices to hw/isa/, configure with default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 01/35] hw: move headers to include/, Paolo Bonzini, 2013/03/18
- Re: [Qemu-devel] [PATCH 00/35] hw/ reorganization, part 2, Peter Maydell, 2013/03/18