commit 1697189977032c5bce6e63036277ad4d8ea2f44b
author Bernhard Beschow <shentey@gmail.com> Sat Oct 07 14:38:27 2023 +0200
committer Michael S. Tsirkin <mst@redhat.com> Sun Oct 22 05:18:17 2023 -0400
tree ccc6cffac143611397253d0738fbc468701f0d34
parent 74bdcfb4b2ba7958efe8e66e06757579d61ebbb3

hw/isa/piix3: Merge hw/isa/piix4.c

Now that the PIIX3 and PIIX4 device models are sufficiently prepared, their
implementations can be merged into one file for further consolidation.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20231007123843.127151-20-shentey@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

hw/isa/Kconfig

diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 17ddb25..040a18c 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -31,16 +31,7 @@
     select FDC_ISA
     select IDE_ISA
 
-config PIIX3
-    bool
-    select ACPI_PIIX4
-    select I8257
-    select IDE_PIIX
-    select ISA_BUS
-    select MC146818RTC
-    select USB_UHCI
-
-config PIIX4
+config PIIX
     bool
     # For historical reasons, SuperIO devices are created in the board
     # for PIIX4.