diff options
author | 2009-10-14 18:23:35 -0300 | |
---|---|---|
committer | 2009-10-14 18:23:35 -0300 | |
commit | 6ca9781b5b84ee211798000276048f6e3dfd9bed (patch) | |
tree | f65e8dbae66ab10f7124193d660e11e18222efd3 /Makefile.hw | |
parent | Merge commit '185c66c81d95a929bc3d38ca52887a8da1e6887f' into upstream-merge (diff) | |
parent | monitor: Convert mon_cmd_t initializations to C99 style (diff) | |
download | qemu-kvm-6ca9781b5b84ee211798000276048f6e3dfd9bed.tar.gz qemu-kvm-6ca9781b5b84ee211798000276048f6e3dfd9bed.tar.bz2 qemu-kvm-6ca9781b5b84ee211798000276048f6e3dfd9bed.zip |
Merge commit 'd7f9b68971d5f9111afeae03c61199346b868c13' into upstream-merge
* commit 'd7f9b68971d5f9111afeae03c61199346b868c13': (25 commits)
monitor: Convert mon_cmd_t initializations to C99 style
Introduce QList unit-tests
Introduce QList
QObject: Accept NULL
Only compile ssi when one target uses it
Only compile ssi-sd when one target uses it
Only compile max111x when one target uses it
Only compile ads7846 when one target uses it
Only compile sd0323 when one target uses it
Only compile sd0303 when one target uses it
Only compile stellaris_input when one target uses it
Only compile tmp105 when one target uses it
Only compile lm832x when one target uses it
Only compile tsc2005 when one target uses it
Only compile twl92230 when one target uses it
Only compile wm8750 when one target uses it
Only compile max7310 when one target uses it
Only compile sd when one target uses it
Only compile ptimer when one target uses it
Only compile m48t59 when one target uses it
...
Conflicts:
qemu-monitor.hx
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile.hw')
-rw-r--r-- | Makefile.hw | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.hw b/Makefile.hw index 21e33647b..de1db31eb 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -16,9 +16,11 @@ obj-y += loader.o obj-y += virtio.o obj-y += fw_cfg.o obj-y += watchdog.o -obj-y += nand.o ecc.o +obj-$(CONFIG_ECC) += ecc.o +obj-$(CONFIG_NAND) += nand.o -obj-y += m48t59.o escc.o +obj-$(CONFIG_M48T59) += m48t59.o +obj-$(CONFIG_ESCC) += escc.o # PCI watchdog devices obj-y += wdt_i6300esb.o @@ -31,9 +33,11 @@ obj-y += wdt_i6300esb.o obj-y += ne2000.o # SCSI layer -obj-y += lsi53c895a.o esp.o +obj-y += lsi53c895a.o +obj-$(CONFIG_ESP) += esp.o -obj-y += dma-helpers.o sysbus.o qdev-addr.o isa-bus.o +obj-y += dma-helpers.o sysbus.o isa-bus.o +obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o all: $(HWLIB) # Dummy command so that make thinks it has done something |