From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHeDV-0000aO-V5 for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:51:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHeDT-00009Y-MC for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:51:25 -0400 Received: from mail-bk0-x234.google.com ([2a00:1450:4008:c01::234]:34496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdyU-0001u6-Ui for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:35:55 -0400 Received: by mail-bk0-f52.google.com with SMTP id jk13so2639313bkc.39 for ; Mon, 18 Mar 2013 10:35:54 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 18 Mar 2013 18:35:01 +0100 Message-Id: <1363628125-5310-12-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 11/35] hw: move watchdogs to hw/watchdog, 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/i386-softmmu.mak | 1 + default-configs/pci.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/i386/Makefile.objs | 1 - hw/watchdog/Makefile.objs | 3 ++- hw/{ => watchdog}/wdt_ib700.c | 0 6 files changed, 5 insertions(+), 2 deletions(-) rename hw/{ => watchdog}/wdt_ib700.c (100%) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 55ba175..0332b43 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -28,3 +28,4 @@ CONFIG_I8259=y CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=y CONFIG_PCI_HOTPLUG=y +CONFIG_WDT_IB700=y diff --git a/default-configs/pci.mak b/default-configs/pci.mak index ee2d18d..4c28e74 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -22,3 +22,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 b5c9d46..9de6e8c 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -28,3 +28,4 @@ CONFIG_I8259=y CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=y CONFIG_PCI_HOTPLUG=y +CONFIG_WDT_IB700=y diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index c813b1e..5559a8b 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 f57133b..4b0374a 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 similarity index 100% rename from hw/wdt_ib700.c rename to hw/watchdog/wdt_ib700.c -- 1.8.1.4