90118a657c
When PHB4 bridge has been added, the dependencies to PCIE_PORT has been
added to XIVE_SPAPR and indirectly to PSERIES.
The build of the PowerNV machine is fine while we also build the PSERIES
machine.
If we disable the PSERIES machine, the PowerNV build fails because the
PCI Express files are not built:
/usr/bin/ld: hw/ppc/pnv.o: in function `pnv_chip_power8_pic_print_info':
.../hw/ppc/pnv.c:623: undefined reference to `pnv_phb3_msi_pic_print_info'
/usr/bin/ld: hw/ppc/pnv.o: in function `pnv_chip_power9_pic_print_info':
.../hw/ppc/pnv.c:639: undefined reference to `pnv_phb4_pic_print_info'
/usr/bin/ld: ../hw/usb/hcd-ehci-pci.o: in function `usb_ehci_pci_write_config':
.../hw/usb/hcd-ehci-pci.c:129: undefined reference to `pci_default_write_config'
/usr/bin/ld: ../hw/usb/hcd-ehci-pci.o: in function `usb_ehci_pci_realize':
.../hw/usb/hcd-ehci-pci.c:68: undefined reference to `pci_allocate_irq'
/usr/bin/ld: .../hw/usb/hcd-ehci-pci.c:72: undefined reference to `pci_register_bar'
/usr/bin/ld: ../hw/usb/hcd-ehci-pci.o:(.data.rel+0x50): undefined reference to `vmstate_pci_device'
This patch fixes the problem by adding needed dependencies to POWERNV.
Fixes: 4f9924c4d4 ("ppc/pnv: Add models for POWER9 PHB4 PCIe Host bridge")
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20200205232016.588202-3-lvivier@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
152 lines
2.4 KiB
Plaintext
152 lines
2.4 KiB
Plaintext
config PSERIES
|
|
bool
|
|
imply PCI_DEVICES
|
|
imply TEST_DEVICES
|
|
imply VIRTIO_VGA
|
|
select DIMM
|
|
select PCI
|
|
select SPAPR_VSCSI
|
|
select VFIO if LINUX # needed by spapr_pci_vfio.c
|
|
select XICS_SPAPR
|
|
select XIVE_SPAPR
|
|
select MSI_NONBROKEN
|
|
select FDT_PPC
|
|
select CHRP_NVRAM
|
|
|
|
config SPAPR_RNG
|
|
bool
|
|
default y
|
|
depends on PSERIES
|
|
|
|
config POWERNV
|
|
bool
|
|
imply PCI_DEVICES
|
|
imply TEST_DEVICES
|
|
select ISA_IPMI_BT
|
|
select IPMI_LOCAL
|
|
select ISA_BUS
|
|
select MC146818RTC
|
|
select XICS
|
|
select XIVE
|
|
select FDT_PPC
|
|
select PCI_EXPRESS
|
|
select MSI_NONBROKEN
|
|
|
|
config PPC405
|
|
bool
|
|
select M48T59
|
|
select PFLASH_CFI02
|
|
select PPC4XX
|
|
select SERIAL
|
|
|
|
config PPC440
|
|
bool
|
|
imply PCI_DEVICES
|
|
imply TEST_DEVICES
|
|
imply E1000_PCI
|
|
select PCI_EXPRESS
|
|
select PPC4XX
|
|
select SERIAL
|
|
select FDT_PPC
|
|
|
|
config PPC4XX
|
|
bool
|
|
select BITBANG_I2C
|
|
select PCI
|
|
|
|
config SAM460EX
|
|
bool
|
|
select PPC405
|
|
select PFLASH_CFI01
|
|
select IDE_SII3112
|
|
select M41T80
|
|
select PPC440
|
|
select SERIAL
|
|
select SM501
|
|
select SMBUS_EEPROM
|
|
select USB_EHCI_SYSBUS
|
|
select USB_OHCI
|
|
select FDT_PPC
|
|
|
|
config PREP
|
|
bool
|
|
imply PCI_DEVICES
|
|
imply TEST_DEVICES
|
|
select CS4231A
|
|
select PREP_PCI
|
|
select I82378
|
|
select LSI_SCSI_PCI
|
|
select M48T59
|
|
select PC87312
|
|
select RS6000_MC
|
|
select FW_CFG_PPC
|
|
|
|
config RS6000_MC
|
|
bool
|
|
|
|
config MAC_OLDWORLD
|
|
bool
|
|
imply PCI_DEVICES
|
|
imply SUNGEM
|
|
imply TEST_DEVICES
|
|
select ADB
|
|
select GRACKLE_PCI
|
|
select HEATHROW_PIC
|
|
select MACIO
|
|
select FW_CFG_PPC
|
|
|
|
config MAC_NEWWORLD
|
|
bool
|
|
imply PCI_DEVICES
|
|
imply SUNGEM
|
|
imply TEST_DEVICES
|
|
select ADB
|
|
select MACIO
|
|
select MACIO_GPIO
|
|
select MAC_PMU
|
|
select UNIN_PCI
|
|
select FW_CFG_PPC
|
|
|
|
config E500
|
|
bool
|
|
imply AT24C
|
|
imply VIRTIO_PCI
|
|
select ETSEC
|
|
select OPENPIC
|
|
select PLATFORM_BUS
|
|
select PPCE500_PCI
|
|
select SERIAL
|
|
select MPC_I2C
|
|
select FDT_PPC
|
|
|
|
config VIRTEX
|
|
bool
|
|
select PPC4XX
|
|
select PFLASH_CFI01
|
|
select SERIAL
|
|
select XILINX
|
|
select XILINX_ETHLITE
|
|
select FDT_PPC
|
|
|
|
config XIVE
|
|
bool
|
|
depends on POWERNV || PSERIES
|
|
|
|
config XIVE_SPAPR
|
|
bool
|
|
default y
|
|
depends on PSERIES
|
|
select XIVE
|
|
|
|
config XIVE_KVM
|
|
bool
|
|
default y
|
|
depends on XIVE_SPAPR && KVM
|
|
|
|
# Only used by 64-bit targets
|
|
config FW_CFG_PPC
|
|
bool
|
|
|
|
config FDT_PPC
|
|
bool
|