From patchwork Thu Apr 4 19:22:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233941 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 E86EB2C00A2 for ; Fri, 5 Apr 2013 07:19:45 +1100 (EST) Received: from localhost ([::1]:37670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNpux-0007mh-SC for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 15:33:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplT-0001bl-Ge for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNplQ-0001tq-0Z for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:03 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:39856) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplP-0001ti-P3 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:23:59 -0400 Received: by mail-wg0-f48.google.com with SMTP id m15so3036194wgh.3 for ; Thu, 04 Apr 2013 12:23:59 -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=3JYAdtSE3crIvgsgUzvD2Un5JJQSX83oQCBjCeRqbBA=; b=XXEV4IYV09UB2yNg+MpTrI4/d8CTQhhIclqVin8qFpIADAw+P3hrgfGvZSHXZ6Fo86 X/4O20MoyRfMTTUbvBrw05E0REqJbva5EHSR8Gg/ZoJg2H/zrmI/mF3oDW/qhRtovzT0 oa6kvMk2J8m3PxnXQgI9hi/R032V5WBdKFFSaFptMITgmJ4EX5dgX4gmjlstzxNMTfV3 lwUJMHoYayeCNJr5Bbb2bXxtn00DjV2d0fa47a0oL8xAQeqTKXp9Uh2kwjFeiaG/UiaJ JGnLzjYE8fDykcLI9O7w149vhBBv4YpuJkGtlfO2P2Dz3yZU5jdaJ/imLHg5SY44P/cO iQKA== X-Received: by 10.180.105.99 with SMTP id gl3mr11366917wib.22.1365103439167; Thu, 04 Apr 2013 12:23:59 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id du2sm33093079wib.0.2013.04.04.12.23.57 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:23:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 21:22:57 +0200 Message-Id: <1365103395-11547-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> References: <1365103395-11547-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.82.48 Subject: [Qemu-devel] [PATCH 17/35] hw: move SSI controllers to hw/ssi/, configure via 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 --- default-configs/arm-softmmu.mak | 1 + default-configs/microblaze-softmmu.mak | 1 + default-configs/microblazeel-softmmu.mak | 1 + hw/arm/Makefile.objs | 3 +-- hw/microblaze/Makefile.objs | 4 ---- hw/ssi/Makefile.objs | 4 ++++ hw/{ => ssi}/omap_spi.c | 0 hw/{ => ssi}/xilinx_spi.c | 0 hw/{ => ssi}/xilinx_spips.c | 0 9 files changed, 8 insertions(+), 6 deletions(-) rename hw/{ => ssi}/omap_spi.c (100%) rename hw/{ => ssi}/xilinx_spi.c (100%) rename hw/{ => ssi}/xilinx_spips.c (100%) diff --git a/hw/omap_spi.c b/hw/ssi/omap_spi.c similarity index 100% rename from hw/omap_spi.c rename to hw/ssi/omap_spi.c diff --git a/hw/xilinx_spi.c b/hw/ssi/xilinx_spi.c similarity index 100% rename from hw/xilinx_spi.c rename to hw/ssi/xilinx_spi.c diff --git a/hw/xilinx_spips.c b/hw/ssi/xilinx_spips.c similarity index 100% rename from hw/xilinx_spips.c rename to hw/ssi/xilinx_spips.c diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 24b0d41..8eb04e2 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -52,6 +52,7 @@ CONFIG_EXYNOS4=y CONFIG_PXA2XX=y CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y +CONFIG_XILINX_SPIPS=y CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y CONFIG_BLIZZARD=y diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak index 050e273..ce26308 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -5,6 +5,7 @@ CONFIG_PFLASH_CFI01=y CONFIG_SERIAL=y CONFIG_XILINX=y CONFIG_XILINX_AXI=y +CONFIG_XILINX_SPI=y CONFIG_XILINX_ETHLITE=y CONFIG_SSI=y CONFIG_SSI_M25P80=y diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/microblazeel-softmmu.mak index db82dd8..acf22c5 100644 --- a/default-configs/microblazeel-softmmu.mak +++ b/default-configs/microblazeel-softmmu.mak @@ -5,6 +5,7 @@ CONFIG_PFLASH_CFI01=y CONFIG_SERIAL=y CONFIG_XILINX=y CONFIG_XILINX_AXI=y +CONFIG_XILINX_SPI=y CONFIG_XILINX_ETHLITE=y CONFIG_SSI=y CONFIG_SSI_M25P80=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 45bde58..6f764e6 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,5 +1,4 @@ obj-y += zynq_slcr.o -obj-y += xilinx_spips.o obj-y += arm_gic.o arm_gic_common.o obj-y += a9scu.o obj-y += realview_gic.o arm_sysctl.o arm11mpcore.o a9mpcore.o @@ -15,7 +14,7 @@ obj-y += zaurus.o obj-y += omap_dma.o omap_clk.o omap_mmc.o \ omap_gpio.o omap_intc.o omap_uart.o obj-y += soc_dma.o omap_gptimer.o omap_synctimer.o \ - omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o + omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o obj-y += tsc210x.o obj-y += cbus.o tusb6010.o obj-y += mst_fpga.o diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index 75f5ce6..c65e2aa 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -1,7 +1,3 @@ -obj-y += xilinx_spi.o - -obj-y := $(addprefix ../,$(obj-y)) - obj-y += petalogix_s3adsp1800_mmu.o obj-y += petalogix_ml605_mmu.o obj-y += boot.o diff --git a/hw/ssi/Makefile.objs b/hw/ssi/Makefile.objs index daada5c..9555825 100644 --- a/hw/ssi/Makefile.objs +++ b/hw/ssi/Makefile.objs @@ -1,2 +1,6 @@ common-obj-$(CONFIG_PL022) += pl022.o common-obj-$(CONFIG_SSI) += ssi.o +common-obj-$(CONFIG_XILINX_SPI) += xilinx_spi.o +common-obj-$(CONFIG_XILINX_SPIPS) += xilinx_spips.o + +obj-$(CONFIG_OMAP) += omap_spi.o