[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/35] hw: move DMA controllers to hw/dma/, configur
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 25/35] hw: move DMA controllers to hw/dma/, configure with default-configs/ |
Date: |
Tue, 2 Apr 2013 16:58:59 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/sparc-softmmu.mak | 2 ++
hw/arm/Makefile.objs | 7 ++-----
hw/cris/Makefile.objs | 1 -
hw/dma/Makefile.objs | 6 ++++++
hw/{ => dma}/etraxfs_dma.c | 0
hw/{ => dma}/omap_dma.c | 0
hw/{ => dma}/pxa2xx_dma.c | 0
hw/{ => dma}/soc_dma.c | 0
hw/{ => dma}/sparc32_dma.c | 0
hw/{ => dma}/sun4m_iommu.c | 0
hw/sparc/Makefile.objs | 4 ++--
11 files changed, 12 insertions(+), 8 deletions(-)
rename hw/{ => dma}/etraxfs_dma.c (100%)
rename hw/{ => dma}/omap_dma.c (100%)
rename hw/{ => dma}/pxa2xx_dma.c (100%)
rename hw/{ => dma}/soc_dma.c (100%)
rename hw/{ => dma}/sparc32_dma.c (100%)
rename hw/{ => dma}/sun4m_iommu.c (100%)
diff --git a/default-configs/sparc-softmmu.mak
b/default-configs/sparc-softmmu.mak
index 6a2bad3..8c4d0a6 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -13,3 +13,5 @@ CONFIG_TCX=y
CONFIG_SLAVIO=y
CONFIG_CS4231=y
CONFIG_GRLIB=y
+CONFIG_STP2000=y
+CONFIG_SUN4M=y
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 8e8e799..59b5cf6 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -6,13 +6,10 @@ obj-y += exynos4210_gic.o exynos4210_combiner.o
obj-y += exynos4210_pmu.o
obj-y += a15mpcore.o
obj-y += armv7m_nvic.o
-obj-y += pxa2xx_dma.o
obj-y += pxa2xx_pcmcia.o
obj-y += zaurus.o
-obj-y += omap_dma.o omap_clk.o \
- omap_gpio.o omap_intc.o
-obj-y += soc_dma.o \
- omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o
+obj-y += omap_clk.o omap_gpio.o omap_intc.o
+obj-y += omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o
obj-y += cbus.o
obj-y += mst_fpga.o
obj-y += strongarm.o
diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs
index a8a4a9e..f8c85a4 100644
--- a/hw/cris/Makefile.objs
+++ b/hw/cris/Makefile.objs
@@ -1,5 +1,4 @@
# IO blocks
-obj-y += etraxfs_dma.o
obj-y += etraxfs_pic.o
obj-y := $(addprefix ../,$(obj-y))
diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
index 7a8ba56..422abc2 100644
--- a/hw/dma/Makefile.objs
+++ b/hw/dma/Makefile.objs
@@ -4,3 +4,9 @@ common-obj-$(CONFIG_PL080) += pl080.o
common-obj-$(CONFIG_PL330) += pl330.o
common-obj-$(CONFIG_I8257) += i8257.o
common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
+
+obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
+obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
+obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
+obj-$(CONFIG_STP2000) += sparc32_dma.o
+obj-$(CONFIG_SUN4M) += sun4m_iommu.o
diff --git a/hw/etraxfs_dma.c b/hw/dma/etraxfs_dma.c
similarity index 100%
rename from hw/etraxfs_dma.c
rename to hw/dma/etraxfs_dma.c
diff --git a/hw/omap_dma.c b/hw/dma/omap_dma.c
similarity index 100%
rename from hw/omap_dma.c
rename to hw/dma/omap_dma.c
diff --git a/hw/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c
similarity index 100%
rename from hw/pxa2xx_dma.c
rename to hw/dma/pxa2xx_dma.c
diff --git a/hw/soc_dma.c b/hw/dma/soc_dma.c
similarity index 100%
rename from hw/soc_dma.c
rename to hw/dma/soc_dma.c
diff --git a/hw/sparc32_dma.c b/hw/dma/sparc32_dma.c
similarity index 100%
rename from hw/sparc32_dma.c
rename to hw/dma/sparc32_dma.c
diff --git a/hw/sun4m_iommu.c b/hw/dma/sun4m_iommu.c
similarity index 100%
rename from hw/sun4m_iommu.c
rename to hw/dma/sun4m_iommu.c
diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs
index ab1d91c..3de10ff 100644
--- a/hw/sparc/Makefile.objs
+++ b/hw/sparc/Makefile.objs
@@ -1,5 +1,5 @@
-obj-y = sun4m_iommu.o slavio_intctl.o
-obj-y += slavio_misc.o sparc32_dma.o
+obj-y = slavio_intctl.o
+obj-y += slavio_misc.o
obj-y += eccmemctl.o sbi.o sun4c_intctl.o
# GRLIB
--
1.8.1.4
- [Qemu-devel] [PATCH 23/35] hw: move PCI bridges to hw/pci/, configure with default-configs/, (continued)
- [Qemu-devel] [PATCH 23/35] hw: move PCI bridges to hw/pci/, configure with default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 26/35] hw: move interrupt controllers to hw/intc/, configure with default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 27/35] hw: move GPIO interfaces to hw/gpio/, configure with default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 11/35] hw: move NICs to hw/net/, configure via default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 22/35] hw: move SD/MMC devices to hw/sd/, configure with default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 06/35] hw: make all of hw/ide/ configurable via default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 24/35] hw: move VFIO and ivshmem to hw/pci/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 25/35] hw: move DMA controllers to hw/dma/, configure with default-configs/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 21/35] hw: move timer devices to hw/timer/, configure with default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 13/35] hw: move audio devices to hw/audio/, configure via default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 05/35] hw: move virtio devices to hw/ subdirectories, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 12/35] hw: move block devices to hw/block/, configure via default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 08/35] hw: make all of hw/pci/ configurable via default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 07/35] hw: make all of hw/usb/ configurable via default-configs/, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 02/35] hw: make subdirectories for devices, Paolo Bonzini, 2013/04/02
- [Qemu-devel] [PATCH 10/35] hw: move MC146818RTC to hw/timer/, configure via default-configs/, Paolo Bonzini, 2013/04/02