[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 03/16] acpi: split out ICH ACPI support
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 03/16] acpi: split out ICH ACPI support |
Date: |
Wed, 8 Jul 2015 12:41:33 +0300 |
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 <address@hidden>
---
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
- [Qemu-devel] [PULL v2 00/16] pc,virtio,pci: fixes and updates, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 01/16] dataplane: fix cross-endian issues, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 03/16] acpi: split out ICH ACPI support,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 02/16] Revert "dataplane: allow virtio-1 devices", Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 04/16] ich9: add TCO interface emulation, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 06/16] ich9: implement strap SPKR pin logic, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 05/16] tests: add testcase for TCO watchdog emulation, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 07/16] hw/i386/pc: factor out pc_cmos_init_floppy(), Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 08/16] hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 09/16] hw/i386/pc: don't carry FDC from pc_basic_device_init() to pc_cmos_init(), Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 10/16] virtio_net: reuse constants from linux, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 12/16] pcie: Set the "link active" in the link status register, Michael S. Tsirkin, 2015/07/08