@@ -1,7 +1,8 @@
# Default configuration for alpha-softmmu
-include pci.mak
include usb.mak
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_I82374=y
@@ -1,7 +1,8 @@
# Default configuration for arm-softmmu
-include pci.mak
include usb.mak
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_VGA=y
CONFIG_NAND=y
CONFIG_ECC=y
@@ -162,3 +163,7 @@ CONFIG_PCI_EXPRESS_DESIGNWARE=y
CONFIG_STRONGARM=y
CONFIG_HIGHBANK=y
CONFIG_MUSICPAL=y
+
+# for realview and versatilepb
+CONFIG_SCSI=y
+CONFIG_LSI_SCSI_PCI=y
@@ -1,5 +1,6 @@
-include pci.mak
include usb.mak
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_ISA_BUS=y
@@ -7,6 +8,8 @@ CONFIG_I8259=y
CONFIG_E1000_PCI=y
CONFIG_IDE_CMD646=y
# CONFIG_IDE_MMIO=y
+CONFIG_SCSI=y
+CONFIG_LSI_SCSI_PCI=y
CONFIG_VIRTIO_VGA=y
CONFIG_MC146818RTC=y
CONFIG_DINO=y
@@ -1,12 +1,12 @@
# Default configuration for i386-softmmu
-include pci.mak
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
include sound.mak
include usb.mak
include hyperv.mak
CONFIG_TEST_DEVICES=y
CONFIG_VGA_ISA=y
-CONFIG_VGA_CIRRUS=y
CONFIG_VMWARE_VGA=y
CONFIG_VMXNET3_PCI=y
CONFIG_VIRTIO_VGA=y
@@ -54,7 +54,6 @@ CONFIG_MEM_DEVICE=y
CONFIG_DIMM=y
CONFIG_NVDIMM=y
CONFIG_ACPI_NVDIMM=y
-CONFIG_PCIE_PORT=y
CONFIG_XIO3130=y
CONFIG_IOH3420=y
CONFIG_I82801B11=y
@@ -1,8 +1,9 @@
# Common mips*-softmmu CONFIG defines
-include pci.mak
include sound.mak
include usb.mak
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_ESP=y
CONFIG_SCSI=y
CONFIG_VGA_ISA=y
@@ -10,6 +10,7 @@ CONFIG_JAZZ=y
CONFIG_G364FB=y
CONFIG_JAZZ_LED=y
CONFIG_VT82C686=y
+CONFIG_AHCI=y
CONFIG_MIPS_BOSTON=y
CONFIG_FITLOADER=y
CONFIG_PCI_EXPRESS=y
deleted file mode 100644
@@ -1,48 +0,0 @@
-CONFIG_PCI=y
-# For now, CONFIG_IDE_CORE requires ISA, so we enable it here
-CONFIG_ISA_BUS=y
-CONFIG_VIRTIO_PCI=y
-include virtio.mak
-CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
-CONFIG_USB_EHCI=y
-CONFIG_USB_XHCI=y
-CONFIG_USB_XHCI_NEC=y
-CONFIG_NE2000_PCI=y
-CONFIG_EEPRO100_PCI=y
-CONFIG_PCNET_PCI=y
-CONFIG_PCNET_COMMON=y
-CONFIG_AC97=y
-CONFIG_HDA=y
-CONFIG_ES1370=y
-CONFIG_SCSI=y
-CONFIG_LSI_SCSI_PCI=y
-CONFIG_VMW_PVSCSI_SCSI_PCI=y
-CONFIG_MEGASAS_SCSI_PCI=y
-CONFIG_MPTSAS_SCSI_PCI=y
-CONFIG_RTL8139_PCI=y
-CONFIG_E1000_PCI=y
-CONFIG_E1000E_PCI_EXPRESS=y
-CONFIG_AHCI=y
-CONFIG_ESP=y
-CONFIG_ESP_PCI=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
-CONFIG_SERIAL_PCI=y
-CONFIG_CAN_BUS=y
-CONFIG_CAN_SJA1000=y
-CONFIG_CAN_PCI=y
-CONFIG_IPACK=y
-CONFIG_WDT_IB6300ESB=y
-CONFIG_PCI_TESTDEV=y
-CONFIG_NVME_PCI=y
-CONFIG_SD=y
-CONFIG_SDHCI=y
-CONFIG_EDU=y
-CONFIG_VGA=y
-CONFIG_VGA_PCI=y
-CONFIG_BOCHS_DISPLAY=y
-CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
-CONFIG_ROCKER=y
-CONFIG_VFIO_PCI=y
-CONFIG_EDID=y
@@ -1,8 +1,9 @@
# Default configuration for ppc-softmmu
-include pci.mak
include sound.mak
include usb.mak
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_TEST_DEVICES=y
# For embedded PPCs:
@@ -1,8 +1,8 @@
# Default configuration for riscv-softmmu
-include pci.mak
include usb.mak
-
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
CONFIG_VIRTIO_MMIO=y
@@ -1,8 +1,8 @@
# Default configuration for riscv-softmmu
-include pci.mak
include usb.mak
-
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
CONFIG_VIRTIO_MMIO=y
@@ -1,7 +1,8 @@
# Default configuration for sh4-softmmu
-include pci.mak
include usb.mak
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_PTIMER=y
@@ -1,7 +1,8 @@
# Default configuration for sh4eb-softmmu
-include pci.mak
include usb.mak
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_PTIMER=y
@@ -1,7 +1,8 @@
# Default configuration for sparc64-softmmu
-include pci.mak
include usb.mak
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
CONFIG_M48T59=y
CONFIG_PTIMER=y
CONFIG_SERIAL=y
@@ -417,7 +417,6 @@ into each QEMU system and userspace emulator targets. They merely
contain a long list of config variable definitions. For example,
default-configs/x86_64-softmmu.mak has:
- include pci.mak
include sound.mak
include usb.mak
CONFIG_QXL=$(CONFIG_SPICE)
@@ -3,9 +3,13 @@ config SB16
config ES1370
bool
+ default y if PCI_DEVICES
+ depends on PCI
config AC97
bool
+ default y if PCI_DEVICES
+ depends on PCI
config ADLIB
bool
@@ -18,6 +22,8 @@ config CS4231A
config HDA
bool
+ default y if PCI_DEVICES
+ depends on PCI
config PCSPK
bool
@@ -21,6 +21,8 @@ config ONENAND
config NVME_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config VIRTIO_BLK
bool
@@ -15,6 +15,8 @@ config SERIAL_ISA
config SERIAL_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config VIRTIO_SERIAL
bool
@@ -9,6 +9,9 @@ config ADS7846
config VGA_CIRRUS
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select VGA
config G364FB
bool
@@ -30,6 +33,9 @@ config SSD0323
config VGA_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select VGA
config VGA_ISA
bool
@@ -39,9 +45,15 @@ config VGA_ISA_MM
config VMWARE_VGA
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select VGA
config BOCHS_DISPLAY
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select VGA
config BLIZZARD
bool
@@ -69,12 +81,16 @@ config VGA
config QXL
bool
depends on SPICE && PCI
+ select VGA
config VIRTIO_GPU
bool
config VIRTIO_VGA
bool
+ default y if PCI_DEVICES
+ depends on VIRTIO_PCI
+ select VGA
config DPCD
bool
@@ -7,6 +7,7 @@ config IDE_QDEV
config IDE_PCI
bool
+ depends on PCI
select IDE_CORE
config IDE_ISA
@@ -42,6 +43,8 @@ config MICRODRIVE
config AHCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
select IDE_QDEV
config IDE_SII3112
@@ -1,2 +1,4 @@
config IPACK
bool
+ default y if PCI_DEVICES
+ depends on PCI
@@ -21,9 +21,13 @@ config ISA_TESTDEV
config PCI_TESTDEV
bool
+ default y if TEST_DEVICES
+ depends on PCI
config EDU
bool
+ default y if TEST_DEVICES
+ depends on PCI
config PCA9552
bool
@@ -48,7 +52,7 @@ config MACIO
config IVSHMEM_DEVICE
bool
- default y
+ default y if PCI_DEVICES
depends on PCI
config ECCMEMCTL
@@ -3,27 +3,42 @@ config DP8393X
config NE2000_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config EEPRO100_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config PCNET_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select PCNET_COMMON
config PCNET_COMMON
bool
config E1000_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config E1000E_PCI_EXPRESS
bool
+ default y if PCI_DEVICES
+ depends on PCI_EXPRESS
config RTL8139_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config VMXNET3_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config SMC91C111
bool
@@ -81,12 +96,20 @@ config ETSEC
config ROCKER
bool
+ default y if PCI_DEVICES
+ depends on PCI
config CAN_BUS
bool
config CAN_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select CAN_BUS
config CAN_SJA1000
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select CAN_BUS
@@ -1,17 +1,25 @@
config PCIE_PORT
bool
+ default y if PCI_DEVICES
+ depends on PCI_EXPRESS
config PXB
bool
config XIO3130
bool
+ default y if PCI_DEVICES
+ depends on PCI_EXPRESS
config IOH3420
bool
+ default y if PCI_DEVICES
+ depends on PCI_EXPRESS
config I82801B11
bool
+ default y if PCI_DEVICES
+ depends on PCI_EXPRESS
config DEC_PCI
bool
@@ -2,21 +2,27 @@ config PAM
bool
config PREP_PCI
+ select PCI
bool
config GRACKLE_PCI
+ select PCI
bool
config UNIN_PCI
+ select PCI
bool
config PPCE500_PCI
+ select PCI
bool
config VERSATILE_PCI
+ select PCI
bool
config PCI_SABRE
+ select PCI
bool
config PCI_PIIX
@@ -24,12 +30,16 @@ config PCI_PIIX
config PCI_EXPRESS_Q35
bool
+ select PCI_EXPRESS
config PCI_EXPRESS_GENERIC_BRIDGE
bool
+ select PCI_EXPRESS
config PCI_EXPRESS_XILINX
bool
+ select PCI_EXPRESS
config PCI_EXPRESS_DESIGNWARE
bool
+ select PCI_EXPRESS
@@ -4,3 +4,6 @@ config PCI
config PCI_EXPRESS
bool
select PCI
+
+config PCI_DEVICES
+ bool
@@ -3,21 +3,32 @@ config SCSI
config LSI_SCSI_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config MPTSAS_SCSI_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config MEGASAS_SCSI_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config VMW_PVSCSI_SCSI_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config ESP
bool
config ESP_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select ESP
config SPAPR_VSCSI
bool
@@ -9,3 +9,6 @@ config SD
config SDHCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select SD
@@ -3,21 +3,31 @@ config USB
config USB_UHCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config USB_OHCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config USB_EHCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config USB_EHCI_SYSBUS
bool
config USB_XHCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
config USB_XHCI_NEC
bool
+ default y if PCI_DEVICES
+ depends on PCI
config USB_MUSB
bool
@@ -6,6 +6,9 @@ config VIRTIO_RNG
config VIRTIO_PCI
bool
+ default y if PCI_DEVICES
+ depends on PCI
+ select VIRTIO
config VIRTIO_MMIO
bool
@@ -3,6 +3,8 @@ config CMSDK_APB_WATCHDOG
config WDT_IB6300ESB
bool
+ default y if PCI_DEVICES
+ depends on PCI
config WDT_IB700
bool