diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 14:54:35 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:14 +0200 |
| commit | 8ac5c6510b609c123d6b394b2de16462ac7c395f (patch) | |
| tree | 45f38521eae28fe3bd1a9c8c55dba2e77fb72297 | |
| parent | 3bd884511f8dc44a01e32878b2972443a16db70d (diff) | |
hw: move SD/MMC devices to hw/sd/, configure with default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/arm/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/lm32/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/sd/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/sd/milkymist-memcard.c (renamed from hw/milkymist-memcard.c) | 0 | ||||
| -rw-r--r-- | hw/sd/omap_mmc.c (renamed from hw/omap_mmc.c) | 0 | ||||
| -rw-r--r-- | hw/sd/pxa2xx_mmci.c (renamed from hw/pxa2xx_mmci.c) | 0 |
6 files changed, 6 insertions, 3 deletions
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 7691540297..8e8e799076 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 f911ac61d1..bf8d152831 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 8acce02518..f1aed83d9d 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 index d5944bca69..d5944bca69 100644 --- a/hw/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c diff --git a/hw/omap_mmc.c b/hw/sd/omap_mmc.c index d4079cde0b..d4079cde0b 100644 --- a/hw/omap_mmc.c +++ b/hw/sd/omap_mmc.c diff --git a/hw/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 2db1cabb7a..2db1cabb7a 100644 --- a/hw/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c |