From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdyb-0001EN-KK for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:36:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHdyZ-0001vX-K4 for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:36:01 -0400 Received: from mail-bk0-x230.google.com ([2a00:1450:4008:c01::230]:52238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdyZ-0001vB-7R for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:35:59 -0400 Received: by mail-bk0-f48.google.com with SMTP id jf20so2635099bkc.21 for ; Mon, 18 Mar 2013 10:35:58 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 18 Mar 2013 18:35:04 +0100 Message-Id: <1363628125-5310-15-git-send-email-pbonzini@redhat.com> In-Reply-To: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> References: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 14/35] hw: move block devices to hw/block/, configure via default-configs/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 1 + default-configs/sh4eb-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/arm/Makefile.objs | 2 +- hw/block/Makefile.objs | 4 ++++ hw/{ => block}/onenand.c | 0 hw/{ => block}/pc_sysfw.c | 0 hw/{ => block}/tc58128.c | 0 hw/i386/Makefile.objs | 1 - hw/sh4/Makefile.objs | 1 - 12 files changed, 10 insertions(+), 3 deletions(-) rename hw/{ => block}/onenand.c (100%) rename hw/{ => block}/pc_sysfw.c (100%) rename hw/{ => block}/tc58128.c (100%) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index cd353bd..7717ea6 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -48,6 +48,7 @@ CONFIG_PL310=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_XGMAC=y +CONFIG_ONENAND=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 7e86bff..05818ef 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -30,3 +30,4 @@ CONFIG_TPM_TIS=y CONFIG_PCI_HOTPLUG=y CONFIG_MC146818RTC=y CONFIG_WDT_IB700=y +CONFIG_PC_SYSFW=y diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index bcafc27..20a05f9 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -6,4 +6,5 @@ CONFIG_SERIAL=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y CONFIG_ISA_MMIO=y +CONFIG_SH4=y CONFIG_IDE_MMIO=y diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak index 8372b0d..875e7e6 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -6,4 +6,5 @@ CONFIG_SERIAL=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y CONFIG_ISA_MMIO=y +CONFIG_SH4=y CONFIG_IDE_MMIO=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index e0f4db6..dd5eb4f 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -30,3 +30,4 @@ CONFIG_TPM_TIS=y CONFIG_PCI_HOTPLUG=y CONFIG_MC146818RTC=y CONFIG_WDT_IB700=y +CONFIG_PC_SYSFW=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index b14beb8..ede019d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -17,7 +17,7 @@ obj-y += omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ obj-y += omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o obj-y += tsc210x.o -obj-y += blizzard.o onenand.o cbus.o tusb6010.o +obj-y += blizzard.o cbus.o tusb6010.o obj-y += mst_fpga.o obj-y += bitbang_i2c.o marvell_88w8618_audio.o obj-y += framebuffer.o diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index 4fcbe45..3343aab 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -6,5 +6,9 @@ common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o common-obj-$(CONFIG_XEN_BACKEND) += xen_disk.o common-obj-$(CONFIG_ECC) += ecc.o +common-obj-$(CONFIG_ONENAND) += onenand.o +common-obj-$(CONFIG_PC_SYSFW) += pc_sysfw.o + +obj-$(CONFIG_SH4) += tc58128.o obj-$(CONFIG_VIRTIO) += dataplane/ virtio-blk.o diff --git a/hw/onenand.c b/hw/block/onenand.c similarity index 100% rename from hw/onenand.c rename to hw/block/onenand.c diff --git a/hw/pc_sysfw.c b/hw/block/pc_sysfw.c similarity index 100% rename from hw/pc_sysfw.c rename to hw/block/pc_sysfw.c diff --git a/hw/tc58128.c b/hw/block/tc58128.c similarity index 100% rename from hw/tc58128.c rename to hw/block/tc58128.c diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 80132d8..6df5fd9 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,6 @@ obj-y += apic_common.o apic.o obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-y += vmport.o obj-y += debugcon.o debugexit.o -obj-y += pc_sysfw.o obj-y += lpc_ich9.o q35.o obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs index 4f2ac2a..efbb9eb 100644 --- a/hw/sh4/Makefile.objs +++ b/hw/sh4/Makefile.objs @@ -1,4 +1,3 @@ -obj-y = tc58128.o obj-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o obj-y := $(addprefix ../,$(obj-y)) -- 1.8.1.4