[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/35] hw: move watchdogs to hw/watchdog, configure
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/35] hw: move watchdogs to hw/watchdog, configure via default-configs/ |
Date: |
Thu, 4 Apr 2013 21:22:50 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 e041a63..7dd0669 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 ce56d58..f5f100e 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 5ba1116..0e5ab55 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 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
- [Qemu-devel] [PATCH v3 00/35] hw/ reorganization, part 2, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 01/35] build: enable using $(CONFIG_FOO) on the rhs of config files, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 03/35] hw: make subdirectories for devices, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 04/35] moxie: configure with default-configs file, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 06/35] hw: move virtio devices to hw/ subdirectories, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 07/35] hw: make all of hw/ide/ configurable via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 08/35] hw: make all of hw/usb/ configurable via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 10/35] hw: move watchdogs to hw/watchdog, configure via default-configs/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/35] hw: make all of hw/pci/ configurable via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 13/35] hw: move block devices to hw/block/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 05/35] hw: move target-independent files to subdirectories, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 11/35] hw: move MC146818RTC to hw/timer/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 12/35] hw: move NICs to hw/net/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 14/35] hw: move audio devices to hw/audio/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 15/35] hw: move display devices to hw/display/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 17/35] hw: move SSI controllers to hw/ssi/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 16/35] hw: move I2C controllers to hw/i2c/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 18/35] hw: move SCSI controllers to hw/scsi/, configure via default-configs/, Paolo Bonzini, 2013/04/04