diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2015-07-07 13:00:56 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-07-07 13:11:57 +0300 |
| commit | 71ba2f0af398f616e154137d9fdda25c2da01324 (patch) | |
| tree | f95366a672eba96302f193d6911aa3a99f78ec3b | |
| parent | f329c74c1e7f08399f0d237f78571eb0ca6a89dd (diff) | |
| download | qemu-71ba2f0af398f616e154137d9fdda25c2da01324.tar.gz qemu-71ba2f0af398f616e154137d9fdda25c2da01324.tar.bz2 qemu-71ba2f0af398f616e154137d9fdda25c2da01324.zip | |
acpi: split out ICH ACPI support
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>
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/acpi/Makefile.objs | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 91d602c2e3..48b57623f7 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 62575ebcd8..4962ed70af 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 29d46d8786..640b15ddc2 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 |