Split serial-isa into its own config option
At present, the core device model code for 8250-like serial ports (serial.c) and the code for serial ports attached to ISA-style legacy IO (serial-isa.c) are both controlled by the CONFIG_SERIAL variable. There are lots and lots of embedded platforms that have 8250-like serial ports but have never had anything resembling ISA legacy IO. Therefore, split serial-isa into its own CONFIG_SERIAL_ISA option so it can be disabled for platforms where it's not appropriate. For now, I enabled CONFIG_SERIAL_ISA in every default-config where CONFIG_SERIAL is enabled, excepting microblaze, or32, and xtensa. As best as I can tell, those platforms never used legacy ISA, and also don't include PCI support (which would allow connection of a PCI->ISA bridge and/or a southbridge including legacy ISA serial ports). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Thomas Huth <thuth@redhat.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
a951316b8a
commit
1401c322c8
@ -3,6 +3,7 @@
|
|||||||
include pci.mak
|
include pci.mak
|
||||||
include usb.mak
|
include usb.mak
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_I8254=y
|
CONFIG_I8254=y
|
||||||
CONFIG_PCKBD=y
|
CONFIG_PCKBD=y
|
||||||
CONFIG_VGA_CIRRUS=y
|
CONFIG_VGA_CIRRUS=y
|
||||||
|
@ -6,6 +6,7 @@ CONFIG_VGA=y
|
|||||||
CONFIG_NAND=y
|
CONFIG_NAND=y
|
||||||
CONFIG_ECC=y
|
CONFIG_ECC=y
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_PTIMER=y
|
CONFIG_PTIMER=y
|
||||||
CONFIG_SD=y
|
CONFIG_SD=y
|
||||||
CONFIG_MAX7310=y
|
CONFIG_MAX7310=y
|
||||||
|
@ -15,6 +15,7 @@ CONFIG_IPMI_EXTERN=y
|
|||||||
CONFIG_ISA_IPMI_KCS=y
|
CONFIG_ISA_IPMI_KCS=y
|
||||||
CONFIG_ISA_IPMI_BT=y
|
CONFIG_ISA_IPMI_BT=y
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_PARALLEL=y
|
CONFIG_PARALLEL=y
|
||||||
CONFIG_I8254=y
|
CONFIG_I8254=y
|
||||||
CONFIG_PCSPK=y
|
CONFIG_PCSPK=y
|
||||||
|
@ -9,6 +9,7 @@ CONFIG_VGA_ISA_MM=y
|
|||||||
CONFIG_VGA_CIRRUS=y
|
CONFIG_VGA_CIRRUS=y
|
||||||
CONFIG_VMWARE_VGA=y
|
CONFIG_VMWARE_VGA=y
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_PARALLEL=y
|
CONFIG_PARALLEL=y
|
||||||
CONFIG_I8254=y
|
CONFIG_I8254=y
|
||||||
CONFIG_PCSPK=y
|
CONFIG_PCSPK=y
|
||||||
|
@ -2,4 +2,5 @@
|
|||||||
|
|
||||||
CONFIG_MC146818RTC=y
|
CONFIG_MC146818RTC=y
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_VGA=y
|
CONFIG_VGA=y
|
||||||
|
@ -27,6 +27,7 @@ CONFIG_AHCI=y
|
|||||||
CONFIG_ESP=y
|
CONFIG_ESP=y
|
||||||
CONFIG_ESP_PCI=y
|
CONFIG_ESP_PCI=y
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_SERIAL_PCI=y
|
CONFIG_SERIAL_PCI=y
|
||||||
CONFIG_IPACK=y
|
CONFIG_IPACK=y
|
||||||
CONFIG_WDT_IB6300ESB=y
|
CONFIG_WDT_IB6300ESB=y
|
||||||
|
@ -46,6 +46,7 @@ CONFIG_PLATFORM_BUS=y
|
|||||||
CONFIG_ETSEC=y
|
CONFIG_ETSEC=y
|
||||||
CONFIG_LIBDECNUMBER=y
|
CONFIG_LIBDECNUMBER=y
|
||||||
# For PReP
|
# For PReP
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_MC146818RTC=y
|
CONFIG_MC146818RTC=y
|
||||||
CONFIG_ISA_TESTDEV=y
|
CONFIG_ISA_TESTDEV=y
|
||||||
CONFIG_RS6000_MC=y
|
CONFIG_RS6000_MC=y
|
||||||
|
@ -52,6 +52,7 @@ CONFIG_XICS=$(CONFIG_PSERIES)
|
|||||||
CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)
|
CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)
|
||||||
CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM))
|
CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM))
|
||||||
# For PReP
|
# For PReP
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_MC146818RTC=y
|
CONFIG_MC146818RTC=y
|
||||||
CONFIG_ISA_TESTDEV=y
|
CONFIG_ISA_TESTDEV=y
|
||||||
CONFIG_MEM_HOTPLUG=y
|
CONFIG_MEM_HOTPLUG=y
|
||||||
|
@ -5,6 +5,7 @@ include sound.mak
|
|||||||
include usb.mak
|
include usb.mak
|
||||||
CONFIG_M48T59=y
|
CONFIG_M48T59=y
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_I8257=y
|
CONFIG_I8257=y
|
||||||
CONFIG_OPENPIC=y
|
CONFIG_OPENPIC=y
|
||||||
CONFIG_PFLASH_CFI01=y
|
CONFIG_PFLASH_CFI01=y
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
include pci.mak
|
include pci.mak
|
||||||
include usb.mak
|
include usb.mak
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_PTIMER=y
|
CONFIG_PTIMER=y
|
||||||
CONFIG_PFLASH_CFI02=y
|
CONFIG_PFLASH_CFI02=y
|
||||||
CONFIG_SH4=y
|
CONFIG_SH4=y
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
include pci.mak
|
include pci.mak
|
||||||
include usb.mak
|
include usb.mak
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_PTIMER=y
|
CONFIG_PTIMER=y
|
||||||
CONFIG_PFLASH_CFI02=y
|
CONFIG_PFLASH_CFI02=y
|
||||||
CONFIG_SH4=y
|
CONFIG_SH4=y
|
||||||
|
@ -5,6 +5,7 @@ include usb.mak
|
|||||||
CONFIG_M48T59=y
|
CONFIG_M48T59=y
|
||||||
CONFIG_PTIMER=y
|
CONFIG_PTIMER=y
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_PARALLEL=y
|
CONFIG_PARALLEL=y
|
||||||
CONFIG_PCKBD=y
|
CONFIG_PCKBD=y
|
||||||
CONFIG_FDC=y
|
CONFIG_FDC=y
|
||||||
|
@ -15,6 +15,7 @@ CONFIG_IPMI_EXTERN=y
|
|||||||
CONFIG_ISA_IPMI_KCS=y
|
CONFIG_ISA_IPMI_KCS=y
|
||||||
CONFIG_ISA_IPMI_BT=y
|
CONFIG_ISA_IPMI_BT=y
|
||||||
CONFIG_SERIAL=y
|
CONFIG_SERIAL=y
|
||||||
|
CONFIG_SERIAL_ISA=y
|
||||||
CONFIG_PARALLEL=y
|
CONFIG_PARALLEL=y
|
||||||
CONFIG_I8254=y
|
CONFIG_I8254=y
|
||||||
CONFIG_PCSPK=y
|
CONFIG_PCSPK=y
|
||||||
|
@ -2,7 +2,8 @@ common-obj-$(CONFIG_IPACK) += ipoctal232.o
|
|||||||
common-obj-$(CONFIG_ESCC) += escc.o
|
common-obj-$(CONFIG_ESCC) += escc.o
|
||||||
common-obj-$(CONFIG_PARALLEL) += parallel.o
|
common-obj-$(CONFIG_PARALLEL) += parallel.o
|
||||||
common-obj-$(CONFIG_PL011) += pl011.o
|
common-obj-$(CONFIG_PL011) += pl011.o
|
||||||
common-obj-$(CONFIG_SERIAL) += serial.o serial-isa.o
|
common-obj-$(CONFIG_SERIAL) += serial.o
|
||||||
|
common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o
|
||||||
common-obj-$(CONFIG_SERIAL_PCI) += serial-pci.o
|
common-obj-$(CONFIG_SERIAL_PCI) += serial-pci.o
|
||||||
common-obj-$(CONFIG_VIRTIO) += virtio-console.o
|
common-obj-$(CONFIG_VIRTIO) += virtio-console.o
|
||||||
common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
|
common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
|
||||||
|
Loading…
Reference in New Issue
Block a user