Commit f8f5cfba authored by Paul Brook's avatar Paul Brook
Browse files

PCI config include 



Split PCI config options into a separate file

Signed-off-by: default avatarPaul Brook <paul@codesourcery.com>
parent bd9141bb

Makefile.objs

+11 −9
Original line number Diff line number Diff line
@@ -161,8 +161,11 @@ hw-obj-y = 
hw-obj-y += vl.o loader.o

hw-obj-y += virtio.o virtio-console.o

hw-obj-y += fw_cfg.o

hw-obj-$(CONFIG_PCI) += pci.o pci_host.o pcie_host.o pci_bridge.o

hw-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o

# FIXME: Core PCI code and its direct dependencies are required by the

# 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-$(CONFIG_ISA_MMIO) += isa_mmio.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



# 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-y += msix.o msi.o

hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o



# PCI network cards

hw-obj-y += ne2000.o

hw-obj-y += eepro100.o

hw-obj-y += pcnet.o

hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o

hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o

hw-obj-$(CONFIG_PCNET_PCI) += pcnet.o



hw-obj-$(CONFIG_SMC91C111) += smc91c111.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



# SCSI layer

hw-obj-y += lsi53c895a.o

hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o

hw-obj-$(CONFIG_ESP) += esp.o



hw-obj-y += dma-helpers.o sysbus.o isa-bus.o

Makefile.target

+2 −2
Original line number Diff line number Diff line
@@ -210,8 +210,8 @@ obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o 
obj-$(CONFIG_USB_OHCI) += usb-ohci.o



# PCI network cards

obj-y += rtl8139.o

obj-y += e1000.o

obj-$(CONFIG_RTL8139_PCI) += rtl8139.o

obj-$(CONFIG_E1000_PCI) += e1000.o



# Inter-VM PCI shared memory

obj-$(CONFIG_KVM) += ivshmem.o

default-configs/arm-softmmu.mak

+1 −2
Original line number Diff line number Diff line 
# Default configuration for arm-softmmu



include pci.mak

CONFIG_GDBSTUB_XML=y

CONFIG_USB_OHCI=y

CONFIG_ISA_MMIO=y

CONFIG_NAND=y

CONFIG_ECC=y
@@ -25,6 +25,5 @@ CONFIG_SSI_SD=y 
CONFIG_LAN9118=y

CONFIG_SMC91C111=y

CONFIG_DS1338=y

CONFIG_VIRTIO_PCI=y

CONFIG_PFLASH_CFI01=y

CONFIG_PFLASH_CFI02=y

default-configs/cris-softmmu.mak

+1 −1
Original line number Diff line number Diff line 
# Default configuration for cris-softmmu



#include pci.mak

CONFIG_NAND=y

CONFIG_PTIMER=y

CONFIG_VIRTIO_PCI=y

CONFIG_PFLASH_CFI02=y

default-configs/i386-softmmu.mak

+1 −3
Original line number Diff line number Diff line 
# Default configuration for i386-softmmu



CONFIG_USB_OHCI=y

include pci.mak

CONFIG_VGA_PCI=y

CONFIG_VGA_ISA=y

CONFIG_VMWARE_VGA=y
@@ -9,7 +9,6 @@ CONFIG_PARALLEL=y 
CONFIG_I8254=y

CONFIG_PCSPK=y

CONFIG_PCKBD=y

CONFIG_USB_UHCI=y

CONFIG_FDC=y

CONFIG_ACPI=y

CONFIG_APM=y
@@ -22,4 +21,3 @@ CONFIG_IDE_PIIX=y 
CONFIG_NE2000_ISA=y

CONFIG_PIIX_PCI=y

CONFIG_SOUND=y
 
CONFIG_VIRTIO_PCI=y