[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/35] hw: move SD/MMC devices to hw/sd/, configure
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 23/35] hw: move SD/MMC devices to hw/sd/, configure with default-configs/ |
Date: |
Thu, 4 Apr 2013 21:23:03 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/arm/Makefile.objs | 4 ++--
hw/lm32/Makefile.objs | 1 -
hw/sd/Makefile.objs | 4 ++++
hw/{ => sd}/milkymist-memcard.c | 0
hw/{ => sd}/omap_mmc.c | 0
hw/{ => sd}/pxa2xx_mmci.c | 0
6 files changed, 6 insertions(+), 3 deletions(-)
rename hw/{ => sd}/milkymist-memcard.c (100%)
rename hw/{ => sd}/omap_mmc.c (100%)
rename hw/{ => sd}/pxa2xx_mmci.c (100%)
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 7691540..8e8e799 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -7,9 +7,9 @@ obj-y += exynos4210_pmu.o
obj-y += a15mpcore.o
obj-y += armv7m_nvic.o
obj-y += pxa2xx_dma.o
-obj-y += pxa2xx_mmci.o pxa2xx_pcmcia.o
+obj-y += pxa2xx_pcmcia.o
obj-y += zaurus.o
-obj-y += omap_dma.o omap_clk.o omap_mmc.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
diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs
index f911ac6..bf8d152 100644
--- a/hw/lm32/Makefile.objs
+++ b/hw/lm32/Makefile.objs
@@ -2,7 +2,6 @@
obj-y += lm32_pic.o
obj-y += lm32_sys.o
obj-y += milkymist-hpdmc.o
-obj-y += milkymist-memcard.o
obj-y += milkymist-pfpu.o
obj-y := $(addprefix ../,$(obj-y))
diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs
index 8acce02..f1aed83 100644
--- a/hw/sd/Makefile.objs
+++ b/hw/sd/Makefile.objs
@@ -2,3 +2,7 @@ common-obj-$(CONFIG_PL181) += pl181.o
common-obj-$(CONFIG_SSI_SD) += ssi-sd.o
common-obj-$(CONFIG_SD) += sd.o
common-obj-$(CONFIG_SDHCI) += sdhci.o
+
+obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o
+obj-$(CONFIG_OMAP) += omap_mmc.o
+obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o
diff --git a/hw/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
similarity index 100%
rename from hw/milkymist-memcard.c
rename to hw/sd/milkymist-memcard.c
diff --git a/hw/omap_mmc.c b/hw/sd/omap_mmc.c
similarity index 100%
rename from hw/omap_mmc.c
rename to hw/sd/omap_mmc.c
diff --git a/hw/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
similarity index 100%
rename from hw/pxa2xx_mmci.c
rename to hw/sd/pxa2xx_mmci.c
--
1.8.1.4
- [Qemu-devel] [PATCH 12/35] hw: move NICs to hw/net/, configure via default-configs/, (continued)
- [Qemu-devel] [PATCH 12/35] hw: move NICs to hw/net/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 14/35] hw: move audio devices to hw/audio/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 15/35] hw: move display devices to hw/display/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 17/35] hw: move SSI controllers to hw/ssi/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 16/35] hw: move I2C controllers to hw/i2c/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 18/35] hw: move SCSI controllers to hw/scsi/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 19/35] hw: move more files to hw/xen/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 21/35] hw: move ISA bridges and devices to hw/isa/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 20/35] hw: move char devices to hw/char/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 25/35] hw: move VFIO and ivshmem to hw/misc/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 23/35] hw: move SD/MMC devices to hw/sd/, configure with default-configs/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 26/35] hw: move DMA controllers to hw/dma/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 24/35] hw: move PCI bridges to hw/pci-* or hw/ARCH, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 28/35] hw: move GPIO interfaces to hw/gpio/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 22/35] hw: move timer devices to hw/timer/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 29/35] hw: move NVRAM interfaces to hw/nvram/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 02/35] hw: move headers to include/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 34/35] MAINTAINERS: update for source code movement, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 33/35] hw: move last file to hw/arm/, Paolo Bonzini, 2013/04/04