mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI config include

Browse Source 
Split PCI config options into a separate file

Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Paul Brook 2010-11-26 21:39:42 +00:00
parent bd9141bb2e
commit f8f5cfbaa4
19 changed files with 29 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.objs
View File

@ -161,8 +161,11 @@ hw-obj-y =
hw-obj-y += vl.o loader.o hw-obj-y += vl.o loader.o
hw-obj-y += virtio.o virtio-console.o hw-obj-y += virtio.o virtio-console.o
hw-obj-y += fw_cfg.o hw-obj-y += fw_cfg.o
hw-obj-$(CONFIG_PCI) += pci.o pci_host.o pcie_host.o pci_bridge.o # FIXME: Core PCI code and its direct dependencies are required by the
hw-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o # QMP query-pci command.
hw-obj-y += pci.o pci_bridge.o msix.o msi.o
hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
hw-obj-y += watchdog.o hw-obj-y += watchdog.o
hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
hw-obj-$(CONFIG_ECC) += ecc.o hw-obj-$(CONFIG_ECC) += ecc.o
@ -207,15 +210,14 @@ hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o
hw-obj-$(CONFIG_PIIX4) += piix4.o hw-obj-$(CONFIG_PIIX4) += piix4.o
# PCI watchdog devices # PCI watchdog devices
hw-obj-y += wdt_i6300esb.o hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
hw-obj-y += pcie.o pcie_port.o hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o
hw-obj-y += msix.o msi.o
# PCI network cards # PCI network cards
hw-obj-y += ne2000.o hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o
hw-obj-y += eepro100.o hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
hw-obj-y += pcnet.o hw-obj-$(CONFIG_PCNET_PCI) += pcnet.o
hw-obj-$(CONFIG_SMC91C111) += smc91c111.o hw-obj-$(CONFIG_SMC91C111) += smc91c111.o
hw-obj-$(CONFIG_LAN9118) += lan9118.o hw-obj-$(CONFIG_LAN9118) += lan9118.o
@ -232,7 +234,7 @@ hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o
hw-obj-$(CONFIG_IDE_VIA) += ide/via.o hw-obj-$(CONFIG_IDE_VIA) += ide/via.o
# SCSI layer # SCSI layer
hw-obj-y += lsi53c895a.o hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o
hw-obj-$(CONFIG_ESP) += esp.o hw-obj-$(CONFIG_ESP) += esp.o
hw-obj-y += dma-helpers.o sysbus.o isa-bus.o hw-obj-y += dma-helpers.o sysbus.o isa-bus.o

4
Makefile.target
View File

@ -210,8 +210,8 @@ obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
obj-$(CONFIG_USB_OHCI) += usb-ohci.o obj-$(CONFIG_USB_OHCI) += usb-ohci.o
# PCI network cards # PCI network cards
obj-y += rtl8139.o obj-$(CONFIG_RTL8139_PCI) += rtl8139.o
obj-y += e1000.o obj-$(CONFIG_E1000_PCI) += e1000.o
# Inter-VM PCI shared memory # Inter-VM PCI shared memory
obj-$(CONFIG_KVM) += ivshmem.o obj-$(CONFIG_KVM) += ivshmem.o

3
default-configs/arm-softmmu.mak
View File

@ -1,7 +1,7 @@
# Default configuration for arm-softmmu # Default configuration for arm-softmmu
include pci.mak
CONFIG_GDBSTUB_XML=y CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_ECC=y CONFIG_ECC=y
@ -25,6 +25,5 @@ CONFIG_SSI_SD=y
CONFIG_LAN9118=y CONFIG_LAN9118=y
CONFIG_SMC91C111=y CONFIG_SMC91C111=y
CONFIG_DS1338=y CONFIG_DS1338=y
CONFIG_VIRTIO_PCI=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y

2
default-configs/cris-softmmu.mak
View File

@ -1,6 +1,6 @@
# Default configuration for cris-softmmu # Default configuration for cris-softmmu
#include pci.mak
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_PTIMER=y CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y

4
default-configs/i386-softmmu.mak
View File

@ -1,6 +1,6 @@
# Default configuration for i386-softmmu # Default configuration for i386-softmmu
CONFIG_USB_OHCI=y include pci.mak
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y CONFIG_VGA_ISA=y
CONFIG_VMWARE_VGA=y CONFIG_VMWARE_VGA=y
@ -9,7 +9,6 @@ CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y
CONFIG_PCSPK=y CONFIG_PCSPK=y
CONFIG_PCKBD=y CONFIG_PCKBD=y
CONFIG_USB_UHCI=y
CONFIG_FDC=y CONFIG_FDC=y
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_APM=y CONFIG_APM=y
@ -22,4 +21,3 @@ CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_PIIX_PCI=y CONFIG_PIIX_PCI=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

2
default-configs/m68k-softmmu.mak
View File

@ -1,5 +1,5 @@
# Default configuration for m68k-softmmu # Default configuration for m68k-softmmu
include pci.mak
CONFIG_GDBSTUB_XML=y CONFIG_GDBSTUB_XML=y
CONFIG_PTIMER=y CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y

1
default-configs/microblaze-softmmu.mak
View File

@ -1,5 +1,4 @@
# Default configuration for microblaze-softmmu # Default configuration for microblaze-softmmu
CONFIG_PTIMER=y CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y

3
default-configs/mips-softmmu.mak
View File

@ -1,5 +1,6 @@
# Default configuration for mips-softmmu # Default configuration for mips-softmmu
include pci.mak
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESP=y CONFIG_ESP=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
@ -11,7 +12,6 @@ CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y
CONFIG_PCSPK=y CONFIG_PCSPK=y
CONFIG_PCKBD=y CONFIG_PCKBD=y
CONFIG_USB_UHCI=y
CONFIG_FDC=y CONFIG_FDC=y
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_APM=y CONFIG_APM=y
@ -24,7 +24,6 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
CONFIG_RC4030=y CONFIG_RC4030=y
CONFIG_DP8393X=y CONFIG_DP8393X=y
CONFIG_DS1225Y=y CONFIG_DS1225Y=y

3
default-configs/mips64-softmmu.mak
View File

@ -1,5 +1,6 @@
# Default configuration for mips64-softmmu # Default configuration for mips64-softmmu
include pci.mak
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESP=y CONFIG_ESP=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
@ -11,7 +12,6 @@ CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y
CONFIG_PCSPK=y CONFIG_PCSPK=y
CONFIG_PCKBD=y CONFIG_PCKBD=y
CONFIG_USB_UHCI=y
CONFIG_FDC=y CONFIG_FDC=y
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_APM=y CONFIG_APM=y
@ -24,7 +24,6 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
CONFIG_RC4030=y CONFIG_RC4030=y
CONFIG_DP8393X=y CONFIG_DP8393X=y
CONFIG_DS1225Y=y CONFIG_DS1225Y=y

3
default-configs/mips64el-softmmu.mak
View File

@ -1,5 +1,6 @@
# Default configuration for mips64el-softmmu # Default configuration for mips64el-softmmu
include pci.mak
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESP=y CONFIG_ESP=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
@ -11,7 +12,6 @@ CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y
CONFIG_PCSPK=y CONFIG_PCSPK=y
CONFIG_PCKBD=y CONFIG_PCKBD=y
CONFIG_USB_UHCI=y
CONFIG_FDC=y CONFIG_FDC=y
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_APM=y CONFIG_APM=y
@ -25,7 +25,6 @@ CONFIG_IDE_PIIX=y
CONFIG_IDE_VIA=y CONFIG_IDE_VIA=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
CONFIG_RC4030=y CONFIG_RC4030=y
CONFIG_DP8393X=y CONFIG_DP8393X=y
CONFIG_DS1225Y=y CONFIG_DS1225Y=y

3
default-configs/mipsel-softmmu.mak
View File

@ -1,5 +1,6 @@
# Default configuration for mipsel-softmmu # Default configuration for mipsel-softmmu
include pci.mak
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESP=y CONFIG_ESP=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
@ -11,7 +12,6 @@ CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y
CONFIG_PCSPK=y CONFIG_PCSPK=y
CONFIG_PCKBD=y CONFIG_PCKBD=y
CONFIG_USB_UHCI=y
CONFIG_FDC=y CONFIG_FDC=y
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_APM=y CONFIG_APM=y
@ -24,7 +24,6 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
CONFIG_RC4030=y CONFIG_RC4030=y
CONFIG_DP8393X=y CONFIG_DP8393X=y
CONFIG_DS1225Y=y CONFIG_DS1225Y=y

3
default-configs/ppc-softmmu.mak
View File

@ -1,7 +1,7 @@
# Default configuration for ppc-softmmu # Default configuration for ppc-softmmu
include pci.mak
CONFIG_GDBSTUB_XML=y CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESCC=y CONFIG_ESCC=y
CONFIG_M48T59=y CONFIG_M48T59=y
@ -31,7 +31,6 @@ CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y CONFIG_IDE_MACIO=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y CONFIG_PTIMER=y

3
default-configs/ppc64-softmmu.mak
View File

@ -1,7 +1,7 @@
# Default configuration for ppc64-softmmu # Default configuration for ppc64-softmmu
include pci.mak
CONFIG_GDBSTUB_XML=y CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESCC=y CONFIG_ESCC=y
CONFIG_M48T59=y CONFIG_M48T59=y
@ -31,7 +31,6 @@ CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y CONFIG_IDE_MACIO=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y CONFIG_PTIMER=y

3
default-configs/ppcemb-softmmu.mak
View File

@ -1,7 +1,7 @@
# Default configuration for ppcemb-softmmu # Default configuration for ppcemb-softmmu
include pci.mak
CONFIG_GDBSTUB_XML=y CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESCC=y CONFIG_ESCC=y
CONFIG_M48T59=y CONFIG_M48T59=y
@ -31,7 +31,6 @@ CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y CONFIG_IDE_MACIO=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y CONFIG_PTIMER=y

3
default-configs/sh4-softmmu.mak
View File

@ -1,9 +1,8 @@
# Default configuration for sh4-softmmu # Default configuration for sh4-softmmu
CONFIG_USB_OHCI=y include pci.mak
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_PTIMER=y CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y
CONFIG_IDE_CORE=y CONFIG_IDE_CORE=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y

3
default-configs/sh4eb-softmmu.mak
View File

@ -1,9 +1,8 @@
# Default configuration for sh4eb-softmmu # Default configuration for sh4eb-softmmu
CONFIG_USB_OHCI=y include pci.mak
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_PTIMER=y CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y
CONFIG_IDE_CORE=y CONFIG_IDE_CORE=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y

2
default-configs/sparc-softmmu.mak
View File

@ -1,10 +1,10 @@
# Default configuration for sparc-softmmu # Default configuration for sparc-softmmu
include pci.mak
CONFIG_ECC=y CONFIG_ECC=y
CONFIG_ESP=y CONFIG_ESP=y
CONFIG_ESCC=y CONFIG_ESCC=y
CONFIG_M48T59=y CONFIG_M48T59=y
CONFIG_PTIMER=y CONFIG_PTIMER=y
CONFIG_FDC=y CONFIG_FDC=y
CONFIG_VIRTIO_PCI=y
CONFIG_EMPTY_SLOT=y CONFIG_EMPTY_SLOT=y

2
default-configs/sparc64-softmmu.mak
View File

@ -1,5 +1,6 @@
# Default configuration for sparc64-softmmu # Default configuration for sparc64-softmmu
include pci.mak
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_M48T59=y CONFIG_M48T59=y
CONFIG_PTIMER=y CONFIG_PTIMER=y
@ -13,4 +14,3 @@ CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y CONFIG_IDE_CMD646=y
CONFIG_VIRTIO_PCI=y

4
default-configs/x86_64-softmmu.mak
View File

@ -1,6 +1,6 @@
# Default configuration for x86_64-softmmu # Default configuration for x86_64-softmmu
CONFIG_USB_OHCI=y include pci.mak
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y CONFIG_VGA_ISA=y
CONFIG_VMWARE_VGA=y CONFIG_VMWARE_VGA=y
@ -9,7 +9,6 @@ CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y
CONFIG_PCSPK=y CONFIG_PCSPK=y
CONFIG_PCKBD=y CONFIG_PCKBD=y
CONFIG_USB_UHCI=y
CONFIG_FDC=y CONFIG_FDC=y
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_APM=y CONFIG_APM=y
@ -22,4 +21,3 @@ CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_PIIX_PCI=y CONFIG_PIIX_PCI=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y