hw: move watchdogs to hw/watchdog, configure via default-configs/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index e041a6387df67c0aa5101723bc53db7a4640c4a1..7dd066989339cb1e9a0cb7d43eb6aac427afff35 100644 (file)
--- 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 ce56d580558114f612b29d479f304b345c708343..f5f100ecb0d5361ef11c6a9aea5cd666aa8dcdff 100644 (file)
--- 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 5ba1116719d9c2ab1b725ab43bdbb91c94aec881..0e5ab554e5b0de094704be053f6ae7e554408daf 100644 (file)
--- 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 c813b1ef78676a219b1c2bc624af886f1a9a5257..5559a8ba5c70d597f414c65d7732d95f5f4b4b13 100644 (file)
--- 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 f57133b72905897f969521ef9fda23ed44d3b0f5..4b0374a555dc574e7f1a562e69d6f2b8e515a815 100644 (file)
--- 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
similarity index 100%
rename from hw/wdt_ib700.c
rename to hw/watchdog/wdt_ib700.c