[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/16] hw/pci-host: Do not build gpex-acpi.c if GPEX is not select
From: |
Laurent Vivier |
Subject: |
[PULL 12/16] hw/pci-host: Do not build gpex-acpi.c if GPEX is not selected |
Date: |
Sat, 15 May 2021 12:03:31 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Since its introduction in commit 5b85eabe68f ("acpi: add
acpi_dsdt_add_gpex") we build gpex-acpi.c if ACPI is selected,
even if the GPEX_HOST device isn't build. Add the missing
Kconfig dependency.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20210425182124.3735214-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/pci-host/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
index 34b3538bebf6..1698d3a1920a 100644
--- a/hw/pci-host/meson.build
+++ b/hw/pci-host/meson.build
@@ -3,7 +3,7 @@ pci_ss.add(when: 'CONFIG_PAM', if_true: files('pam.c'))
pci_ss.add(when: 'CONFIG_PCI_BONITO', if_true: files('bonito.c'))
pci_ss.add(when: 'CONFIG_PCI_EXPRESS_DESIGNWARE', if_true:
files('designware.c'))
pci_ss.add(when: 'CONFIG_PCI_EXPRESS_GENERIC_BRIDGE', if_true: files('gpex.c'))
-pci_ss.add(when: 'CONFIG_ACPI', if_true: files('gpex-acpi.c'))
+pci_ss.add(when: ['CONFIG_PCI_EXPRESS_GENERIC_BRIDGE', 'CONFIG_ACPI'],
if_true: files('gpex-acpi.c'))
pci_ss.add(when: 'CONFIG_PCI_EXPRESS_Q35', if_true: files('q35.c'))
pci_ss.add(when: 'CONFIG_PCI_EXPRESS_XILINX', if_true: files('xilinx-pcie.c'))
pci_ss.add(when: 'CONFIG_PCI_I440FX', if_true: files('i440fx.c'))
--
2.31.1
- [PULL 04/16] virtio-net: Constify VirtIOFeature feature_sizes[], (continued)
- [PULL 04/16] virtio-net: Constify VirtIOFeature feature_sizes[], Laurent Vivier, 2021/05/15
- [PULL 05/16] virtiofsd: Fix check of chown()'s return value, Laurent Vivier, 2021/05/15
- [PULL 10/16] cutils: fix memory leak in get_relocated_path(), Laurent Vivier, 2021/05/15
- [PULL 07/16] hw/gpio/aspeed: spelling fix (addtional), Laurent Vivier, 2021/05/15
- [PULL 11/16] hw/mem/meson: Fix linking sparse-mem device with fuzzer, Laurent Vivier, 2021/05/15
- [PULL 14/16] target/sh4: Return error if CPUClass::get_phys_page_debug() fails, Laurent Vivier, 2021/05/15
- [PULL 16/16] target/avr: Ignore unimplemented WDR opcode, Laurent Vivier, 2021/05/15
- [PULL 08/16] hw/timer/etraxfs_timer: Convert to 3-phase reset (Resettable interface), Laurent Vivier, 2021/05/15
- [PULL 09/16] hw/rtc/mc146818rtc: Convert to 3-phase reset (Resettable interface), Laurent Vivier, 2021/05/15
- [PULL 13/16] multi-process: Avoid logical AND of mutually exclusive tests, Laurent Vivier, 2021/05/15
- [PULL 12/16] hw/pci-host: Do not build gpex-acpi.c if GPEX is not selected,
Laurent Vivier <=
- [PULL 15/16] hw/avr/atmega.c: use the avr51 cpu for atmega1280, Laurent Vivier, 2021/05/15
- Re: [PULL 00/16] Trivial branch for 6.1 patches, Peter Maydell, 2021/05/17