From nobody Sun Oct 5 01:45:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551727519521655.0320120345423; Mon, 4 Mar 2019 11:25:19 -0800 (PST) Received: from localhost ([127.0.0.1]:59558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tD8-0005Vp-Tf for importer@patchew.org; Mon, 04 Mar 2019 14:25:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCY-0001vC-Lk for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCW-000400-HH for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:34 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:51869) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCW-0003yT-6D for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:32 -0500 Received: by mail-wm1-x329.google.com with SMTP id n19so140537wmi.1 for ; Mon, 04 Mar 2019 10:20:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=pBuee7aaw+YRYEP3YtmyWObmim9fsj47g2eoR/5HkfA=; b=Tu8q3EyzshITPR/lPKLuDg6PE1Vh4vI1M1PE+SHnn87VNMQkxVbuKM4e+ES1RyyxHN BbM4XBBpSD/np2ik4C15igsyhElfrvchhE9TgkTyDNadihX4N+n+rMmLrN8k1Rp6kxwq /dKU+gh9qrHUf6z/sSM96t/4HQIQiGFIv0BEQOcGlRJjvpJoPF7kp8BWwFrtD2x/lMGl QqOXQxvtRA25mFFAJ8pIrXlVatmAss20huL4MhL3CbH2oDaCrVSt54GUUTmMF76asVkd r2Yb8t7LGQ95dpcO2jWgWigCHvzyQjZvL2cDHEqBxe/9QQUTU9f42WqXUNwi4dW6+kky V9yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=pBuee7aaw+YRYEP3YtmyWObmim9fsj47g2eoR/5HkfA=; b=maLOLZhKVfa1Edohah01azkGsn78Kv7LYh+LKnZIYqKrHuF+UN4f51/Ooz8hVrg9ez L5H69F4Xkqc7kWF18uJnKFawgr1gn581H0rkjjNJYQrrGkEq7TNCFOp8QPqqoMNU1tWw TCR0lQSrrJqZ5B0NCTOxe448s7BDfaeXrRhkJt89fK/5c99oQyHYyiN7BLSZGoSAy+NH a7+dAOnlNQvWODQJxMmCZip09cTgahbwtCEfPhQuC/lTlsmxtRPbcf8FsskwUEkCd8oz 1tfcW2/KSe/+HpMBB1/B1L0ubC2J9YkaNi4rAkOSkAIgirkH3gD4d5WpZZQro3DHUg6j 8kQw== X-Gm-Message-State: APjAAAWwxEcfZ0FXK0z/40+Spv6ylvqceusC1Jom5+kvEkLG4gWYU7Mo rab6p0Lhj+8TSrZL3Ldib4d1Ol/9 X-Google-Smtp-Source: APXvYqxtG34wpuIt03sQBMnJpb7sbVAJjJBzu7/jHCHJtFHo53YfrvpnPmwhWZ7KymX6Xwzv0L5Cmg== X-Received: by 2002:a1c:7906:: with SMTP id l6mr253695wme.83.1551723630512; Mon, 04 Mar 2019 10:20:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:35 +0100 Message-Id: <1551723614-1823-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 Subject: [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of including the same list of devices for each target, set CONFIG_PCI to true, and make the devices default to present whenever PCI is available. However, s390x does not want all the PCI devices, so there is a separate symbol to enable them. Done mostly with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y if PCI_DEVICES\' -e' depends on PCI'= \ `grep -lw $i hw/*/Kconfig` done < default-configs/pci.mak followed by replacing a few "depends on" clauses with "select" whenever the symbol is not really related to PCI. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-31-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 3 ++- default-configs/arm-softmmu.mak | 7 ++++- default-configs/hppa-softmmu.mak | 5 +++- default-configs/i386-softmmu.mak | 5 ++-- default-configs/mips-softmmu-common.mak | 3 ++- default-configs/mips64el-softmmu.mak | 1 + default-configs/pci.mak | 47 -----------------------------= ---- default-configs/ppc-softmmu.mak | 3 ++- default-configs/riscv32-softmmu.mak | 4 +-- default-configs/riscv64-softmmu.mak | 4 +-- default-configs/sh4-softmmu.mak | 3 ++- default-configs/sh4eb-softmmu.mak | 3 ++- default-configs/sparc64-softmmu.mak | 3 ++- docs/devel/build-system.txt | 1 - hw/audio/Kconfig | 6 +++++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 2 ++ hw/display/Kconfig | 19 +++++++++++++ hw/ide/Kconfig | 3 +++ hw/ipack/Kconfig | 2 ++ hw/misc/Kconfig | 6 ++++- hw/net/Kconfig | 23 ++++++++++++++++ hw/pci-bridge/Kconfig | 8 ++++++ hw/pci-host/Kconfig | 10 +++++++ hw/pci/Kconfig | 3 +++ hw/scsi/Kconfig | 11 ++++++++ hw/sd/Kconfig | 3 +++ hw/usb/Kconfig | 10 +++++++ hw/virtio/Kconfig | 3 +++ hw/watchdog/Kconfig | 2 ++ 30 files changed, 141 insertions(+), 64 deletions(-) delete mode 100644 default-configs/pci.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 8000a9a..27936dd 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for alpha-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_I82374=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index b430be5..e9a972f 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for arm-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy @@ -163,3 +164,7 @@ CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy CONFIG_STRONGARM=3Dy CONFIG_HIGHBANK=3Dy CONFIG_MUSICPAL=3Dy + +# for realview and versatilepb +CONFIG_SCSI=3Dy +CONFIG_LSI_SCSI_PCI=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index e0a6cdc..85a2011 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,5 +1,6 @@ -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_ISA_BUS=3Dy @@ -7,6 +8,8 @@ CONFIG_I8259=3Dy CONFIG_E1000_PCI=3Dy CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy +CONFIG_SCSI=3Dy +CONFIG_LSI_SCSI_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_MC146818RTC=3Dy CONFIG_DINO=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index c7e32ce..b4dc3a0 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,12 +1,12 @@ # Default configuration for i386-softmmu =20 -include pci.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy include sound.mak include usb.mak include hyperv.mak CONFIG_TEST_DEVICES=3Dy CONFIG_VGA_ISA=3Dy -CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy @@ -45,7 +45,6 @@ CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index cba8582..9c2146e 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,8 +1,9 @@ # Common mips*-softmmu CONFIG defines =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy CONFIG_SCSI=3Dy CONFIG_VGA_ISA=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index c6ad4da..8b255ef 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -10,6 +10,7 @@ CONFIG_JAZZ=3Dy CONFIG_G364FB=3Dy CONFIG_JAZZ_LED=3Dy CONFIG_VT82C686=3Dy +CONFIG_AHCI=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy CONFIG_PCI_EXPRESS=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak deleted file mode 100644 index fc5edfc..0000000 --- a/default-configs/pci.mak +++ /dev/null @@ -1,47 +0,0 @@ -CONFIG_PCI=3Dy -# For now, CONFIG_IDE_CORE requires ISA, so we enable it here -CONFIG_ISA_BUS=3Dy -CONFIG_VIRTIO_PCI=3Dy -include virtio.mak -CONFIG_USB_UHCI=3Dy -CONFIG_USB_OHCI=3Dy -CONFIG_USB_EHCI=3Dy -CONFIG_USB_XHCI=3Dy -CONFIG_USB_XHCI_NEC=3Dy -CONFIG_NE2000_PCI=3Dy -CONFIG_EEPRO100_PCI=3Dy -CONFIG_PCNET_PCI=3Dy -CONFIG_PCNET_COMMON=3Dy -CONFIG_AC97=3Dy -CONFIG_HDA=3Dy -CONFIG_ES1370=3Dy -CONFIG_SCSI=3Dy -CONFIG_LSI_SCSI_PCI=3Dy -CONFIG_VMW_PVSCSI_SCSI_PCI=3Dy -CONFIG_MEGASAS_SCSI_PCI=3Dy -CONFIG_MPTSAS_SCSI_PCI=3Dy -CONFIG_RTL8139_PCI=3Dy -CONFIG_E1000_PCI=3Dy -CONFIG_E1000E_PCI_EXPRESS=3Dy -CONFIG_AHCI=3Dy -CONFIG_ESP=3Dy -CONFIG_ESP_PCI=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_SERIAL_PCI=3Dy -CONFIG_CAN_BUS=3Dy -CONFIG_CAN_SJA1000=3Dy -CONFIG_CAN_PCI=3Dy -CONFIG_IPACK=3Dy -CONFIG_WDT_IB6300ESB=3Dy -CONFIG_PCI_TESTDEV=3Dy -CONFIG_NVME_PCI=3Dy -CONFIG_SD=3Dy -CONFIG_SDHCI=3Dy -CONFIG_EDU=3Dy -CONFIG_VGA=3Dy -CONFIG_VGA_PCI=3Dy -CONFIG_BOCHS_DISPLAY=3Dy -CONFIG_ROCKER=3Dy -CONFIG_VFIO_PCI=3Dy -CONFIG_EDID=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 5ccdcb6..74e31a6 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,8 +1,9 @@ # Default configuration for ppc-softmmu =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_TEST_DEVICES=3Dy =20 # For embedded PPCs: diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 8c3a91a..5501c1b 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,8 +1,8 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 8c3a91a..5501c1b 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,8 +1,8 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index e406559..87da3a6 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sh4-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 14dea69..ce9aae9 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sh4eb-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 1e519b3..bf52d52 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sparc64-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy CONFIG_PTIMER=3Dy CONFIG_SERIAL=3Dy diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index f9fd27f..addd274 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -417,7 +417,6 @@ into each QEMU system and userspace emulator targets. T= hey merely contain a long list of config variable definitions. For example, default-configs/x86_64-softmmu.mak has: =20 - include pci.mak include sound.mak include usb.mak CONFIG_QXL=3D$(CONFIG_SPICE) diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 45d3a6a..6517e90 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -3,9 +3,13 @@ config SB16 =20 config ES1370 bool + default y if PCI_DEVICES + depends on PCI =20 config AC97 bool + default y if PCI_DEVICES + depends on PCI =20 config ADLIB bool @@ -18,6 +22,8 @@ config CS4231A =20 config HDA bool + default y if PCI_DEVICES + depends on PCI =20 config PCSPK bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index aca8d11..0aa82ac 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -23,6 +23,8 @@ config ONENAND =20 config NVME_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VIRTIO_BLK bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index fbb0a9b..fc18481 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -20,6 +20,8 @@ config SERIAL_ISA =20 config SERIAL_PCI bool + default y if PCI_DEVICES + depends on PCI select SERIAL =20 config VIRTIO_SERIAL diff --git a/hw/display/Kconfig b/hw/display/Kconfig index bbd6dd9..4941773 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -9,6 +9,9 @@ config ADS7846 =20 config VGA_CIRRUS bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config G364FB bool @@ -30,6 +33,9 @@ config SSD0323 =20 config VGA_PCI bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config VGA_ISA bool @@ -42,9 +48,15 @@ config VGA_ISA_MM =20 config VMWARE_VGA bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config BOCHS_DISPLAY bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config BLIZZARD bool @@ -72,12 +84,19 @@ config VGA config QXL bool depends on SPICE && PCI + select VGA =20 config VIRTIO_GPU bool + default y if PCI_DEVICES + depends on VIRTIO + select EDID =20 config VIRTIO_VGA bool + default y if PCI_DEVICES + depends on VIRTIO_PCI + select VGA =20 config DPCD bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 88076a7..ab47b6a 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -7,6 +7,7 @@ config IDE_QDEV =20 config IDE_PCI bool + depends on PCI select IDE_CORE =20 config IDE_ISA @@ -43,6 +44,8 @@ config MICRODRIVE =20 config AHCI bool + default y if PCI_DEVICES + depends on PCI select IDE_QDEV =20 config IDE_SII3112 diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig index 481e0d2..f8da24a 100644 --- a/hw/ipack/Kconfig +++ b/hw/ipack/Kconfig @@ -1,2 +1,4 @@ config IPACK bool + default y if PCI_DEVICES + depends on PCI diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index a1e4bd8..41d8633 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -26,9 +26,13 @@ config ISA_TESTDEV =20 config PCI_TESTDEV bool + default y if TEST_DEVICES + depends on PCI =20 config EDU bool + default y if TEST_DEVICES + depends on PCI =20 config PCA9552 bool @@ -53,7 +57,7 @@ config MACIO =20 config IVSHMEM_DEVICE bool - default y + default y if PCI_DEVICES depends on PCI && LINUX && IVSHMEM =20 config ECCMEMCTL diff --git a/hw/net/Kconfig b/hw/net/Kconfig index f4b5ff2..a309831 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -3,27 +3,42 @@ config DP8393X =20 config NE2000_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config EEPRO100_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config PCNET_PCI bool + default y if PCI_DEVICES + depends on PCI + select PCNET_COMMON =20 config PCNET_COMMON bool =20 config E1000_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config E1000E_PCI_EXPRESS bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config RTL8139_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VMXNET3_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config SMC91C111 bool @@ -85,12 +100,20 @@ config ETSEC =20 config ROCKER bool + default y if PCI_DEVICES + depends on PCI =20 config CAN_BUS bool =20 config CAN_PCI bool + default y if PCI_DEVICES + depends on PCI + select CAN_BUS =20 config CAN_SJA1000 bool + default y if PCI_DEVICES + depends on PCI + select CAN_BUS diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index bb19b7a..0519eb1 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -1,17 +1,25 @@ config PCIE_PORT bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config PXB bool =20 config XIO3130 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config IOH3420 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config I82801B11 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config DEC_PCI bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 2edc5bb..c01812a 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -2,21 +2,27 @@ config PAM bool =20 config PREP_PCI + select PCI bool =20 config GRACKLE_PCI + select PCI bool =20 config UNIN_PCI + select PCI bool =20 config PPCE500_PCI + select PCI bool =20 config VERSATILE_PCI + select PCI bool =20 config PCI_SABRE + select PCI bool =20 config PCI_PIIX @@ -24,12 +30,16 @@ config PCI_PIIX =20 config PCI_EXPRESS_Q35 bool + select PCI_EXPRESS =20 config PCI_EXPRESS_GENERIC_BRIDGE bool + select PCI_EXPRESS =20 config PCI_EXPRESS_XILINX bool + select PCI_EXPRESS =20 config PCI_EXPRESS_DESIGNWARE bool + select PCI_EXPRESS diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index 4ca2537..3b8638b 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -4,3 +4,6 @@ config PCI config PCI_EXPRESS bool select PCI + +config PCI_DEVICES + bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index 982537b..8144ccb 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -3,21 +3,32 @@ config SCSI =20 config LSI_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config MPTSAS_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config MEGASAS_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VMW_PVSCSI_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config ESP bool =20 config ESP_PCI bool + default y if PCI_DEVICES + depends on PCI + select ESP =20 config SPAPR_VSCSI bool diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index 4f43bbb..c6c5dfb 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -9,3 +9,6 @@ config SD =20 config SDHCI bool + default y if PCI_DEVICES + depends on PCI + select SD diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index cbf5c5d..86ee615 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -3,21 +3,31 @@ config USB =20 config USB_UHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_OHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_EHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_EHCI_SYSBUS bool =20 config USB_XHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_XHCI_NEC bool + default y if PCI_DEVICES + depends on PCI =20 config USB_MUSB bool diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index ebf1812..5dafbe3 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -6,6 +6,9 @@ config VIRTIO_RNG =20 config VIRTIO_PCI bool + default y if PCI_DEVICES + depends on PCI + select VIRTIO =20 config VIRTIO_MMIO bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 4bbd981..35ccb72 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -3,6 +3,8 @@ config CMSDK_APB_WATCHDOG =20 config WDT_IB6300ESB bool + default y if PCI_DEVICES + depends on PCI =20 config WDT_IB700 bool --=20 1.8.3.1