The PIIX4 chipset is a generic southbridge and can be used by
non-X86 hardware. Introduce the ACPI_PIIX4 Kconfig.
Hardware that requires ACPI but doesn't need the PIIX4 chipset
won't compile it.
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
default-configs/mips-softmmu-common.mak | 2 +-
hw/acpi/Kconfig | 7 +++++++
hw/acpi/Makefile.objs | 3 ++-
hw/i386/Kconfig | 2 ++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/default-configs/mips-softmmu-common.mak
b/default-configs/mips-softmmu-common.mak
index 6f49a3a8c7..21c6e3cbe3 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -16,7 +16,7 @@ CONFIG_PCSPK=y
CONFIG_I8042=y
CONFIG_FDC=y
CONFIG_ACPI=y
-CONFIG_ACPI_X86=y
+CONFIG_ACPI_PIIX4=y
CONFIG_ACPI_MEMORY_HOTPLUG=y
CONFIG_ACPI_NVDIMM=y
CONFIG_ACPI_CPU_HOTPLUG=y
diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index b18ddb06da..10f24f3b41 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -8,6 +8,13 @@ config ACPI_X86
select ACPI_CPU_HOTPLUG
select ACPI_MEMORY_HOTPLUG
+config ACPI_PIIX4
+ bool
+ select ACPI
+ select ACPI_NVDIMM
+ select ACPI_CPU_HOTPLUG
+ select ACPI_MEMORY_HOTPLUG
+
config ACPI_ICH9
bool
select ACPI
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index dff94d35e7..c5c2c1cf03 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -1,4 +1,5 @@
-common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
+common-obj-$(CONFIG_ACPI) += core.o
+common-obj-$(CONFIG_ACPI_PIIX4) += piix4.o pcihp.o
common-obj-$(CONFIG_ACPI_ICH9) += ich9.o tco.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index 7fa5395894..64f9957047 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -69,6 +69,8 @@ config ISAPC
# FIXME: it is in the same file as i440fx, and does not compile
# if separated
depends on I440FX
+ # QEMU isapc weirdness: it uses PIIX3 with ACPI features from PIIX4
+ select ACPI_PIIX4
config Q35
bool
--
2.20.1
