From patchwork Tue Apr 2 14:58:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2ECE92C0102 for ; Wed, 3 Apr 2013 02:13:42 +1100 (EST) Received: from localhost ([::1]:39151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2u4-0008F9-9G for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 11:13:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2rw-0005Pq-2Z for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:11:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2ro-0006Ci-Vk for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:11:28 -0400 Received: from mail-ee0-f52.google.com ([74.125.83.52]:42547) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gu-0001bx-IA for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:04 -0400 Received: by mail-ee0-f52.google.com with SMTP id d17so273699eek.39 for ; Tue, 02 Apr 2013 08:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=HlpuQb0qO56n+dmd8EDre+X0nkmBgH2hvXuhze0AVqQ=; b=hoeaj+DRt5VHGKQqtVg715MWOXYwk7oINYfrW9s4Ql+xEUI1aJXSN0hxsAk00/hM3t DENQ3/MS8yzyQG34d1+exG/B8tDGcuHhI4VcwxFlHo3TJCh7jpcv77NYikUh3f4JOREA PyAqvjinbat8EP4G47orR/hZ2fXYMCFwBYALRCfdylbwy732Wx3grkT8vDDRCrfGaim7 JnYpz30iUD8Qvo9AyQ7fvEsHYdhP4vM/eh8I5xIYDzvG/CrzzT5tN8TLqS2pJkJCbU6Q B9qcxetJ7mvZZwnrpue7WSBfTe5d9Czx1pYz0zJeu1oe3bowL3g8YxY8Gm5heWytBKPV gf8w== X-Received: by 10.14.219.7 with SMTP id l7mr50097901eep.12.1364914803515; Tue, 02 Apr 2013 08:00:03 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id n2sm3179353eeo.10.2013.04.02.08.00.01 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 08:00:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:58:56 +0200 Message-Id: <1364914749-11141-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.83.52 Subject: [Qemu-devel] [PATCH 22/35] hw: move SD/MMC devices to hw/sd/, configure with default-configs/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- 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/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 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