From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Igor Mammedov <imammedo@redhat.com>
Subject: [Qemu-devel] [PULL 03/13] acpi: split out ICH ACPI support
Date: Tue, 7 Jul 2015 15:40:09 +0300 [thread overview]
Message-ID: <1436272760-29611-4-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1436272760-29611-1-git-send-email-mst@redhat.com>
MIPS doesn't need it, and including it creates problem as we are adding
dependency on ISA LPC bridge.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
default-configs/i386-softmmu.mak | 1 +
default-configs/x86_64-softmmu.mak | 1 +
hw/acpi/Makefile.objs | 3 ++-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 91d602c..48b5762 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -16,6 +16,7 @@ CONFIG_PCKBD=y
CONFIG_FDC=y
CONFIG_ACPI=y
CONFIG_ACPI_X86=y
+CONFIG_ACPI_X86_ICH=y
CONFIG_ACPI_MEMORY_HOTPLUG=y
CONFIG_ACPI_CPU_HOTPLUG=y
CONFIG_APM=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 62575eb..4962ed7 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -17,6 +17,7 @@ CONFIG_PCKBD=y
CONFIG_FDC=y
CONFIG_ACPI=y
CONFIG_ACPI_X86=y
+CONFIG_ACPI_X86_ICH=y
CONFIG_ACPI_MEMORY_HOTPLUG=y
CONFIG_ACPI_CPU_HOTPLUG=y
CONFIG_APM=y
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 29d46d8..640b15d 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -1,4 +1,5 @@
-common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o ich9.o pcihp.o
+common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
+common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
common-obj-$(CONFIG_ACPI) += acpi_interface.o
--
MST
next prev parent reply other threads:[~2015-07-07 12:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 12:40 [Qemu-devel] [PULL 00/13] pc,virtio,pci: fixes and updates Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 01/13] dataplane: fix cross-endian issues Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 02/13] Revert "dataplane: allow virtio-1 devices" Michael S. Tsirkin
2015-07-07 12:40 ` Michael S. Tsirkin [this message]
2015-07-07 12:40 ` [Qemu-devel] [PULL 04/13] ich9: add TCO interface emulation Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 05/13] tests: add testcase for TCO watchdog emulation Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 06/13] ich9: implement strap SPKR pin logic Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 07/13] hw/i386/pc: factor out pc_cmos_init_floppy() Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 08/13] hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 09/13] hw/i386/pc: don't carry FDC from pc_basic_device_init() to pc_cmos_init() Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 10/13] virtio_net: reuse constants from linux Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 11/13] pci_regs.h: import " Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 12/13] pcie: Set the "link active" in the link status register Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 13/13] virtio: define virtio_pci_cfg_cap in header Michael S. Tsirkin
2015-07-07 16:18 ` [Qemu-devel] [PULL 00/13] pc,virtio,pci: fixes and updates Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436272760-29611-4-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=imammedo@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).