]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
hw: move SD/MMC devices to hw/sd/, configure with default-configs/
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Feb 2013 13:54:35 +0000 (14:54 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 8 Apr 2013 16:13:14 +0000 (18:13 +0200)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/arm/Makefile.objs
hw/lm32/Makefile.objs
hw/sd/Makefile.objs
hw/sd/milkymist-memcard.c [moved from hw/milkymist-memcard.c with 100% similarity]
hw/sd/omap_mmc.c [moved from hw/omap_mmc.c with 100% similarity]
hw/sd/pxa2xx_mmci.c [moved from hw/pxa2xx_mmci.c with 100% similarity]

index 76915402976c3045b61b6b77085f02cdfe11cff6..8e8e79907600d5cea2547b9469d1353a4b083d97 100644 (file)
@@ -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
index f911ac61d1ef40bdaf89d3ed02c54214cccc0e3e..bf8d152831af42071957730b0dc7c4ef6a8da352 100644 (file)
@@ -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))
index 8acce025180c75696ce870bfc0c06364dd3192d9..f1aed83d9d05652afa76f624b1fbca4be3dd16b7 100644 (file)
@@ -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
similarity index 100%
rename from hw/omap_mmc.c
rename to hw/sd/omap_mmc.c
similarity index 100%
rename from hw/pxa2xx_mmci.c
rename to hw/sd/pxa2xx_mmci.c