diff mbox series

[1/5] hw/acpi/Kconfig: Add missing dependencies to ACPI_PIIX4

Message ID 20221207231205.1106381-2-shentey@gmail.com
State New
Headers show
Series Clean up dependencies of ACPI controllers | expand

Commit Message

Bernhard Beschow Dec. 7, 2022, 11:12 p.m. UTC 
piix4_pm_realize() uses apm_init() and pm_smbus_init(), so both APM and
ACPI_SMBUS are provided by the device model managed by ACPI_PIIX4.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 configs/devices/mips-softmmu/common.mak | 2 --
 hw/acpi/Kconfig                         | 2 ++
 hw/i386/Kconfig                         | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak
index 416161f833..3011304443 100644
--- a/configs/devices/mips-softmmu/common.mak
+++ b/configs/devices/mips-softmmu/common.mak
@@ -19,7 +19,6 @@  CONFIG_PCKBD=y
 CONFIG_FDC=y
 CONFIG_ACPI=y
 CONFIG_ACPI_PIIX4=y
-CONFIG_APM=y
 CONFIG_I8257=y
 CONFIG_PIIX4=y
 CONFIG_IDE_ISA=y
@@ -32,6 +31,5 @@  CONFIG_MIPS_ITU=y
 CONFIG_MALTA=y
 CONFIG_PCNET_PCI=y
 CONFIG_MIPSSIM=y
-CONFIG_ACPI_SMBUS=y
 CONFIG_SMBUS_EEPROM=y
 CONFIG_TEST_DEVICES=y
diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index 3703aca212..9504cbad2f 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -30,6 +30,8 @@  config ACPI_NVDIMM
 
 config ACPI_PIIX4
     bool
+    select ACPI_SMBUS
+    select APM
     depends on ACPI
 
 config ACPI_PCIHP
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index d22ac4a4b9..2fdefd7458 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -62,7 +62,6 @@  config PC_ACPI
     select ACPI_VIOT
     select SMBUS_EEPROM
     select PFLASH_CFI01
-    depends on ACPI_SMBUS
 
 config I440FX
     bool
@@ -71,7 +70,6 @@  config I440FX
     imply VMMOUSE
     select PC_PCI
     select PC_ACPI
-    select ACPI_SMBUS
     select PCI_I440FX
     select PIIX3
     select IDE_PIIX