On 2019-01-15 15:10, Yang Zhong wrote:
> Make pcie splited from pci and make it configurable.
>
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
> ---
> default-configs/pci.mak | 1 +
> hw/pci/Kconfig | 3 +++
> hw/pci/Makefile.objs | 5 +++--
> 3 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/default-configs/pci.mak b/default-configs/pci.mak
> index c1b64922b9..553b1905de 100644
> --- a/default-configs/pci.mak
> +++ b/default-configs/pci.mak
> @@ -1,4 +1,5 @@
> CONFIG_PCI=y
> +CONFIG_PCIE=y
> # For now, CONFIG_IDE_CORE requires ISA, so we enable it here
> CONFIG_ISA_BUS=y
> CONFIG_VIRTIO_PCI=y
> diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig
> index d3d2205577..a717a26995 100644
> --- a/hw/pci/Kconfig
> +++ b/hw/pci/Kconfig
> @@ -1,2 +1,5 @@
> config PCI
> bool
> +
> +config PCIE
> + bool
> diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs
> index 9f905e6344..a995795a47 100644
> --- a/hw/pci/Makefile.objs
> +++ b/hw/pci/Makefile.objs
> @@ -2,8 +2,9 @@ common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
> common-obj-$(CONFIG_PCI) += msix.o msi.o
> common-obj-$(CONFIG_PCI) += shpc.o
> common-obj-$(CONFIG_PCI) += slotid_cap.o
> -common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
> -common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
> +common-obj-$(CONFIG_PCI) += pci_host.o
> +common-obj-$(CONFIG_PCIE) += pcie.o pcie_aer.o
> +common-obj-$(CONFIG_PCIE) += pcie_port.o pcie_host.o
>
> common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o
> common-obj-$(CONFIG_ALL) += pci-stub.o
>
Reviewed-by: Thomas Huth <thuth@redhat.com>