motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/char/parallel: Make it possible to compile also without CONFIG_PARALLEL

Browse source 
For the downstream distribution of QEMU, we want to compile without
CONFIG_PARALLEL. Commit 9157eee1b1 already moved the function
parallel_hds_isa_init() (which is still required for linking) into a file
that is included anyway, but commit bb3d5ea858 moved it
to a separate file which is only compiled again if CONFIG_PARALLEL is
set. To be able to link QEMU again without CONFIG_PARALLEL, the file
should be considered for linking for all targets that have CONFIG_ISA_BUS.
And while we're at it, add a proper comment in there with the rationale
for the separate file.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1552297854-25847-1-git-send-email-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Thomas Huth 2019-03-11 10:50:54 +01:00 • committed by Paolo Bonzini
parent cedc0ad539
commit 3e3fdad6e1
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/char/Makefile.objs
View file

@ -2,7 +2,7 @@ common-obj-$(CONFIG_IPACK) += ipoctal232.o
common-obj-$(CONFIG_ESCC) += escc.o common-obj-$(CONFIG_ESCC) += escc.o
common-obj-$(CONFIG_NRF51_SOC) += nrf51_uart.o common-obj-$(CONFIG_NRF51_SOC) += nrf51_uart.o
common-obj-$(CONFIG_PARALLEL) += parallel.o common-obj-$(CONFIG_PARALLEL) += parallel.o
common-obj-$(CONFIG_PARALLEL) += parallel-isa.o common-obj-$(CONFIG_ISA_BUS) += parallel-isa.o
common-obj-$(CONFIG_PL011) += pl011.o common-obj-$(CONFIG_PL011) += pl011.o
common-obj-$(CONFIG_SERIAL) += serial.o common-obj-$(CONFIG_SERIAL) += serial.o
common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o

3
hw/char/parallel-isa.c
View file

@ -1,6 +1,9 @@
/* /*
* QEMU Parallel PORT (ISA bus helpers) * QEMU Parallel PORT (ISA bus helpers)
* *
* These functions reside in a separate file since they also might be
* required for linking when compiling QEMU without CONFIG_PARALLEL.
*
* Copyright (c) 2003 Fabrice Bellard * Copyright (c) 2003 Fabrice Bellard
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT

3
hw/i386/Kconfig
View file

@ -9,6 +9,7 @@ config PC
imply ISA_IPMI_KCS imply ISA_IPMI_KCS
imply ISA_IPMI_BT imply ISA_IPMI_BT
imply ISA_DEBUG imply ISA_DEBUG
imply PARALLEL
imply PCI_DEVICES imply PCI_DEVICES
imply PVPANIC imply PVPANIC
imply QXL imply QXL
@ -25,8 +26,6 @@ config PC
select I82374 select I82374
select I8257 select I8257
select MC146818RTC select MC146818RTC
# Needed by the board code:
select PARALLEL
# For ACPI builder: # For ACPI builder:
select SERIAL_ISA select SERIAL_ISA
select ACPI_VMGENID select ACPI_VMGENID

2
hw/sparc64/Kconfig
View file

@ -3,13 +3,13 @@ config SUN4U
imply PCI_DEVICES imply PCI_DEVICES
imply SUNHME imply SUNHME
imply TEST_DEVICES imply TEST_DEVICES
imply PARALLEL
select M48T59 select M48T59
select ISA_BUS select ISA_BUS
select FDC select FDC
select SERIAL_ISA select SERIAL_ISA
select PCI_SABRE select PCI_SABRE
select IDE_CMD646 select IDE_CMD646
select PARALLEL
select PCKBD select PCKBD
select SIMBA select SIMBA