SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/i386/Kconfig: Allow to compile Q35 without FDC_ISA

Browse Source 
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>
This commit is contained in:
Thomas Huth 2024-04-25 20:43:14 +02:00 committed by Philippe Mathieu-Daudé
parent 64436c5c17
commit 77af05946e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/Kconfig
View File

@ -32,7 +32,7 @@ config PC
imply VGA_PCI imply VGA_PCI
imply VIRTIO_VGA imply VIRTIO_VGA
imply NVDIMM imply NVDIMM
select FDC_ISA imply FDC_ISA
select I8259 select I8259
select I8254 select I8254
select PCKBD select PCKBD
@ -72,6 +72,7 @@ config I440FX
imply VMPORT imply VMPORT
imply VMMOUSE imply VMMOUSE
select ACPI_PIIX4 select ACPI_PIIX4
select FDC_ISA
select PC_PCI select PC_PCI
select PC_ACPI select PC_ACPI
select PCI_I440FX select PCI_I440FX
@ -87,6 +88,7 @@ config ISAPC
depends on I386 depends on I386
imply VGA_ISA imply VGA_ISA
select ISA_BUS select ISA_BUS
select FDC_ISA
select PC select PC
select IDE_ISA select IDE_ISA
# FIXME: it is in the same file as i440fx, and does not compile # FIXME: it is in the same file as i440fx, and does not compile