diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 12:55:04 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:13 +0200 |
| commit | 7b2478956a1aece1c79ece8dec250ed91c09903b (patch) | |
| tree | d77b056b02073b9fab5e84ce908e107df0ab54c5 /hw | |
| parent | d7e35d4a8495bfb3aa0dfd6319fcc499f43a175c (diff) | |
| download | qemu-7b2478956a1aece1c79ece8dec250ed91c09903b.tar.gz qemu-7b2478956a1aece1c79ece8dec250ed91c09903b.tar.bz2 qemu-7b2478956a1aece1c79ece8dec250ed91c09903b.zip | |
hw: move block devices to hw/block/, configure via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/block/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/block/onenand.c (renamed from hw/onenand.c) | 0 | ||||
| -rw-r--r-- | hw/block/pc_sysfw.c (renamed from hw/pc_sysfw.c) | 0 | ||||
| -rw-r--r-- | hw/block/tc58128.c (renamed from hw/tc58128.c) | 0 | ||||
| -rw-r--r-- | hw/i386/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/sh4/Makefile.objs | 1 |
7 files changed, 5 insertions, 3 deletions
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index b14beb86ef..ede019da02 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 856915eb6a..e4329a08a9 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -6,6 +6,10 @@ 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) += virtio-blk.o obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += dataplane/ diff --git a/hw/onenand.c b/hw/block/onenand.c index 8b511a79dc..8b511a79dc 100644 --- a/hw/onenand.c +++ b/hw/block/onenand.c diff --git a/hw/pc_sysfw.c b/hw/block/pc_sysfw.c index 0d95c8a926..0d95c8a926 100644 --- a/hw/pc_sysfw.c +++ b/hw/block/pc_sysfw.c diff --git a/hw/tc58128.c b/hw/block/tc58128.c index a3929d444f..a3929d444f 100644 --- a/hw/tc58128.c +++ b/hw/block/tc58128.c diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 80132d8f40..6df5fd9196 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 4f2ac2a6ce..efbb9ebef1 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)) |