[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/14] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PATCH 09/14] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule |
|
Date: |
Tue, 31 Dec 2019 19:32:11 +0100 |
The CONFIG_PSERIES already selects CONFIG_PCI.
Simplify the Makefile rules.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/ppc/Makefile.objs | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 101e9fc591..79adf06aa3 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -7,14 +7,11 @@ obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o
obj-$(CONFIG_PSERIES) += spapr_cpu_core.o spapr_ovec.o spapr_irq.o
obj-$(CONFIG_PSERIES) += spapr_tpm_proxy.o
obj-$(CONFIG_SPAPR_RNG) += spapr_rng.o
+obj-$(call land,$(CONFIG_PSERIES),$(CONFIG_LINUX)) += spapr_pci_vfio.o
spapr_pci_nvlink2.o
# IBM PowerNV
obj-$(CONFIG_POWERNV) += pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.o
pnv_occ.o pnv_bmc.o
obj-$(CONFIG_POWERNV) += pnv_homer.o pnv_pnor.o
-
-ifeq ($(CONFIG_PCI)$(CONFIG_PSERIES)$(CONFIG_LINUX), yyy)
-obj-y += spapr_pci_vfio.o spapr_pci_nvlink2.o
-endif
obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o
# PowerPC 4xx boards
obj-$(CONFIG_PPC405) += ppc405_boards.o ppc405_uc.o
--
2.21.0
- [PATCH 00/14] hw: Fix various --without-default-devices issues, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 01/14] hw/usb/redirect: Do not link 'usb-redir' device when USB not enabled, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 02/14] hw/intc/i8259: Fix Kconfig dependency on ISA bus, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 03/14] hw/i386/Kconfig: Let the MicroVM machine select the SERIAL_ISA config, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 04/14] hw/i386: Restrict fw_cfg to the PC machines, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 05/14] hw/i2c/Kconfig: Add an entry for the SMBus, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 06/14] hw/ppc/Kconfig: Restrict the MPC I2C controller to e500-based platforms, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 07/14] hw/ppc/Kconfig: Let the Sam460ex board use the PowerPC 405 devices, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 08/14] hw/ppc/Kconfig: Let the Xilinx Virtex5 ML507 use the PPC-440 devices, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 09/14] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule,
Philippe Mathieu-Daudé <=
- [PATCH 10/14] hw/ppc/Kconfig: Only select fw_cfg with machines using OpenBIOS, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 11/14] hw/ppc/Kconfig: Only select FDT helper for machines using it, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 13/14] hw/nvram/Kconfig: Restrict CHRP NVRAM to machines using OpenBIOS or SLOF, Philippe Mathieu-Daudé, 2019/12/31
- [RFC PATCH 14/14] hw/intc/Kconfig: Let APIC select IOAPIC, Philippe Mathieu-Daudé, 2019/12/31
- [PATCH 12/14] hw/nvram/Kconfig: Add an entry for the NMC93xx EEPROM, Philippe Mathieu-Daudé, 2019/12/31