diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 12:27:44 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:13 +0200 |
| commit | a100107d5612ba568c817f22c628b2c9eeb431bf (patch) | |
| tree | 316743c0e842d28dbe547175ecee915e56e4fc88 | |
| parent | ddf2bcfc63e7c73cc37f870599ee61f9204bde66 (diff) | |
| download | qemu-a100107d5612ba568c817f22c628b2c9eeb431bf.tar.gz | |
hw: move watchdogs to hw/watchdog, configure via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/pci.mak | 1 | ||||
| -rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/i386/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/watchdog/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/watchdog/wdt_ib700.c (renamed from hw/wdt_ib700.c) | 0 |
6 files changed, 5 insertions, 2 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index e041a6387d..7dd0669893 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -29,3 +29,4 @@ CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=y CONFIG_TPM_PASSTHROUGH=y CONFIG_PCI_HOTPLUG=y +CONFIG_WDT_IB700=y diff --git a/default-configs/pci.mak b/default-configs/pci.mak index ce56d58055..f5f100ecb0 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -23,3 +23,4 @@ CONFIG_ESP_PCI=y CONFIG_SERIAL=y CONFIG_SERIAL_PCI=y CONFIG_IPACK=y +CONFIG_WDT_IB6300ESB=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 5ba1116719..0e5ab554e5 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -29,3 +29,4 @@ CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=y CONFIG_TPM_PASSTHROUGH=y CONFIG_PCI_HOTPLUG=y +CONFIG_WDT_IB700=y diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index c813b1ef78..5559a8ba5c 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,6 @@ obj-y += mc146818rtc.o 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 += wdt_ib700.o obj-y += debugcon.o debugexit.o obj-y += pc_sysfw.o obj-y += lpc_ich9.o q35.o diff --git a/hw/watchdog/Makefile.objs b/hw/watchdog/Makefile.objs index f57133b729..4b0374a555 100644 --- a/hw/watchdog/Makefile.objs +++ b/hw/watchdog/Makefile.objs @@ -1,2 +1,3 @@ common-obj-y += watchdog.o -common-obj-$(CONFIG_PCI) += wdt_i6300esb.o +common-obj-$(CONFIG_WDT_IB6300ESB) += wdt_i6300esb.o +common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o diff --git a/hw/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index b8c4be85ff..b8c4be85ff 100644 --- a/hw/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c |