From 7c28b925b7e176b4e44ed05d23cf883561000546 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 23 Jan 2019 14:56:04 +0800 Subject: build: convert pci.mak to Kconfig 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=${i%=y}; i=${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/riscv32-softmmu.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'default-configs/riscv32-softmmu.mak') diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index 8c3a91a185..5501c1b884 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -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 -- cgit v1.2.3