From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 15/38] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule
Date: Wed, 8 Jan 2020 13:32:32 +0100 [thread overview]
Message-ID: <1578486775-52247-16-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The CONFIG_PSERIES already selects CONFIG_PCI.
Simplify the Makefile rules.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191231183216.6781-10-philmd@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
next prev parent reply other threads:[~2020-01-08 12:49 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 12:32 [PULL 00/38] Misc patches for 2020-01-08 Paolo Bonzini
2020-01-08 12:32 ` [PULL 01/38] x86: Check for machine state object class before typecasting it Paolo Bonzini
2020-01-08 12:32 ` [PULL 02/38] accel/kvm: Make "kernel_irqchip" default on Paolo Bonzini
2020-01-08 12:32 ` [PULL 03/38] hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35 Paolo Bonzini
2020-01-08 12:32 ` [PULL 04/38] replay: check other timers for icount limit Paolo Bonzini
2020-01-08 12:32 ` [PULL 05/38] replay: record and replay random number sources Paolo Bonzini
2020-01-08 12:32 ` [PULL 06/38] hw/i386/x86-iommu: Add missing stubs Paolo Bonzini
2020-01-08 12:32 ` [PULL 07/38] hw/i386/pc: fix regression in parsing vga cmdline parameter Paolo Bonzini
2020-01-08 12:32 ` [PULL 08/38] hw/timer/Kconfig: Intel 8254 PIT depends of ISA bus Paolo Bonzini
2020-01-08 12:32 ` [PULL 09/38] hw/usb/redirect: Do not link 'usb-redir' device when USB not enabled Paolo Bonzini
2020-01-08 12:32 ` [PULL 10/38] hw/intc/i8259: Fix Kconfig dependency on ISA bus Paolo Bonzini
2020-01-08 12:32 ` [PULL 11/38] hw/i386/Kconfig: Let the MicroVM machine select the SERIAL_ISA config Paolo Bonzini
2020-01-08 12:32 ` [PULL 12/38] hw/ppc/Kconfig: Restrict the MPC I2C controller to e500-based platforms Paolo Bonzini
2020-01-08 12:32 ` [PULL 13/38] hw/ppc/Kconfig: Let the Sam460ex board use the PowerPC 405 devices Paolo Bonzini
2020-01-08 12:32 ` [PULL 14/38] hw/ppc/Kconfig: Let the Xilinx Virtex5 ML507 use the PPC-440 devices Paolo Bonzini
2020-01-08 12:32 ` Paolo Bonzini [this message]
2020-01-08 12:32 ` [PULL 16/38] hw/ppc/Kconfig: Only select fw_cfg with machines using OpenBIOS Paolo Bonzini
2020-01-08 12:32 ` [PULL 17/38] hw/ppc/Kconfig: Only select FDT helper for machines using it Paolo Bonzini
2020-01-08 12:32 ` [PULL 18/38] hw/nvram/Kconfig: Add an entry for the NMC93xx EEPROM Paolo Bonzini
2020-01-08 12:32 ` [PULL 19/38] hw/nvram/Kconfig: Restrict CHRP NVRAM to machines using OpenBIOS or SLOF Paolo Bonzini
2020-01-08 12:32 ` [PULL 20/38] hw/rtc/mc146818: Add missing dependency on ISA Bus Paolo Bonzini
2020-01-08 12:32 ` [PULL 21/38] target/i386: Fix handling of k_gs_base register in 32-bit mode in gdbstub Paolo Bonzini
2020-01-08 12:32 ` [PULL 22/38] target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES Paolo Bonzini
2020-01-08 12:32 ` [PULL 23/38] target/i386: Add missed features to Cooperlake CPU model Paolo Bonzini
2020-01-08 12:32 ` [PULL 24/38] hw/ipmi: Remove unnecessary declarations Paolo Bonzini
2020-01-08 12:32 ` [PULL 25/38] hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler Paolo Bonzini
2020-01-08 12:32 ` [PULL 26/38] hw/char/terminal3270: Explicit ignored " Paolo Bonzini
2020-01-08 12:32 ` [PULL 27/38] hw/usb/dev-serial: Explicit we ignore few " Paolo Bonzini
2020-01-08 12:32 ` [PULL 28/38] hw/usb/redirect: " Paolo Bonzini
2020-01-08 12:32 ` [PULL 29/38] ccid-card-passthru: Explicit we ignore " Paolo Bonzini
2020-01-08 12:32 ` [PULL 30/38] vhost-user-crypto: Explicit we ignore some " Paolo Bonzini
2020-01-08 12:32 ` [PULL 31/38] vhost-user-net: Explicit we ignore few " Paolo Bonzini
2020-01-08 12:32 ` [PULL 32/38] vhost-user-blk: " Paolo Bonzini
2020-01-08 12:32 ` [PULL 33/38] virtio-console: Explicit we ignore some " Paolo Bonzini
2020-01-08 12:32 ` [PULL 34/38] monitor/qmp: Explicit we ignore few " Paolo Bonzini
2020-01-08 12:32 ` [PULL 35/38] monitor/hmp: Explicit we ignore a " Paolo Bonzini
2020-01-08 12:32 ` [PULL 36/38] chardev/char: Explicit we ignore some " Paolo Bonzini
2020-01-08 12:32 ` [PULL 37/38] chardev: use QEMUChrEvent instead of int Paolo Bonzini
2020-01-08 12:32 ` [PULL 38/38] chardev: Use QEMUChrEvent enum in IOEventHandler typedef Paolo Bonzini
2020-01-08 14:28 ` [PULL 00/38] Misc patches for 2020-01-08 no-reply
2020-01-13 9:50 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1578486775-52247-16-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).