diff options
| author | Thomas Huth <thuth@redhat.com> | 2024-04-25 20:43:14 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-05-08 19:43:23 +0200 |
| commit | 77af05946e450a804b55b4a10b0b1fbd4f838fa4 (patch) | |
| tree | c8f605647d645f04e0d8c9ea6441e71a85731568 | |
| parent | 64436c5c1739abf58ef3b768c20f312355c370fc (diff) | |
| download | focaccia-qemu-77af05946e450a804b55b4a10b0b1fbd4f838fa4.tar.gz focaccia-qemu-77af05946e450a804b55b4a10b0b1fbd4f838fa4.zip | |
hw/i386/Kconfig: Allow to compile Q35 without FDC_ISA
The q35 machine can be used without floppy disk controller (FDC), but due to our current Kconfig setup, the FDC code is still always included in the binary. To fix this, the "PC" config option should only imply the "FDC_ISA" instead of always selecting it. The i440fx and the isa-pc machine currently always instantiate the FDC, so we have to add the select statements now there instead. Signed-off-by: Thomas Huth <thuth@redhat.com> Acked-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20240425184315.553329-3-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
| -rw-r--r-- | hw/i386/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 4362164962..58ca8f246d 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -32,7 +32,7 @@ config PC imply VGA_PCI imply VIRTIO_VGA imply NVDIMM - select FDC_ISA + imply FDC_ISA select I8259 select I8254 select PCKBD @@ -72,6 +72,7 @@ config I440FX imply VMPORT imply VMMOUSE select ACPI_PIIX4 + select FDC_ISA select PC_PCI select PC_ACPI select PCI_I440FX @@ -87,6 +88,7 @@ config ISAPC depends on I386 imply VGA_ISA select ISA_BUS + select FDC_ISA select PC select IDE_ISA # FIXME: it is in the same file as i440fx, and does not compile |