[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/38] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule
From: |
Paolo Bonzini |
Subject: |
[PULL 15/38] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule |
Date: |
Wed, 8 Jan 2020 13:32:32 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
The CONFIG_PSERIES already selects CONFIG_PCI.
Simplify the Makefile rules.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Acked-by: David Gibson <address@hidden>
Signed-off-by: Paolo Bonzini <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 101e9fc..79adf06 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
--
1.8.3.1
- [PULL 05/38] replay: record and replay random number sources, (continued)
- [PULL 05/38] replay: record and replay random number sources, Paolo Bonzini, 2020/01/08
- [PULL 06/38] hw/i386/x86-iommu: Add missing stubs, Paolo Bonzini, 2020/01/08
- [PULL 07/38] hw/i386/pc: fix regression in parsing vga cmdline parameter, Paolo Bonzini, 2020/01/08
- [PULL 08/38] hw/timer/Kconfig: Intel 8254 PIT depends of ISA bus, Paolo Bonzini, 2020/01/08
- [PULL 09/38] hw/usb/redirect: Do not link 'usb-redir' device when USB not enabled, Paolo Bonzini, 2020/01/08
- [PULL 10/38] hw/intc/i8259: Fix Kconfig dependency on ISA bus, Paolo Bonzini, 2020/01/08
- [PULL 11/38] hw/i386/Kconfig: Let the MicroVM machine select the SERIAL_ISA config, Paolo Bonzini, 2020/01/08
- [PULL 12/38] hw/ppc/Kconfig: Restrict the MPC I2C controller to e500-based platforms, Paolo Bonzini, 2020/01/08
- [PULL 13/38] hw/ppc/Kconfig: Let the Sam460ex board use the PowerPC 405 devices, Paolo Bonzini, 2020/01/08
- [PULL 14/38] hw/ppc/Kconfig: Let the Xilinx Virtex5 ML507 use the PPC-440 devices, Paolo Bonzini, 2020/01/08
- [PULL 15/38] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule,
Paolo Bonzini <=
- [PULL 16/38] hw/ppc/Kconfig: Only select fw_cfg with machines using OpenBIOS, Paolo Bonzini, 2020/01/08
- [PULL 17/38] hw/ppc/Kconfig: Only select FDT helper for machines using it, Paolo Bonzini, 2020/01/08
- [PULL 19/38] hw/nvram/Kconfig: Restrict CHRP NVRAM to machines using OpenBIOS or SLOF, Paolo Bonzini, 2020/01/08
- [PULL 18/38] hw/nvram/Kconfig: Add an entry for the NMC93xx EEPROM, Paolo Bonzini, 2020/01/08
- [PULL 20/38] hw/rtc/mc146818: Add missing dependency on ISA Bus, Paolo Bonzini, 2020/01/08
- [PULL 21/38] target/i386: Fix handling of k_gs_base register in 32-bit mode in gdbstub, Paolo Bonzini, 2020/01/08
- [PULL 22/38] target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES, Paolo Bonzini, 2020/01/08
- [PULL 23/38] target/i386: Add missed features to Cooperlake CPU model, Paolo Bonzini, 2020/01/08
- [PULL 25/38] hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 24/38] hw/ipmi: Remove unnecessary declarations, Paolo Bonzini, 2020/01/08