[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/15] hw/intc: Mark more interrupt-controller files as target ind
From: |
Laurent Vivier |
Subject: |
[PULL 07/15] hw/intc: Mark more interrupt-controller files as target independent |
Date: |
Wed, 18 Jan 2023 08:52:26 +0100 |
From: Thomas Huth <thuth@redhat.com>
Seems like there is also nothing target-specific in here, so these
files can be moved to softmmu_ss to avoid that they get compiled
twice (once for qemu-system-arm and once for qemu-system-aarch64).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230112134928.1026006-7-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/intc/meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/intc/meson.build b/hw/intc/meson.build
index 0988cae8ab06..8be459b41c6e 100644
--- a/hw/intc/meson.build
+++ b/hw/intc/meson.build
@@ -12,6 +12,8 @@ softmmu_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files(
'arm_gicv3_its.c',
'arm_gicv3_redist.c',
))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true:
files('allwinner-a10-pic.c'))
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c'))
softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c'))
softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c',
'exynos4210_combiner.c'))
softmmu_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c'))
@@ -19,8 +21,10 @@ softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true:
files('heathrow_pic.c'))
softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c',
'i8259.c'))
softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c'))
softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
+softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c',
'bcm2836_control.c'))
softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_gic.c'))
softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_intctl.c'))
softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_intc.c'))
@@ -33,25 +37,21 @@ if config_all_devices.has_key('CONFIG_APIC') or \
softmmu_ss.add(files('kvm_irqcount.c'))
endif
-specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true:
files('allwinner-a10-pic.c'))
specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c'))
specific_ss.add(when: 'CONFIG_ARM_GIC', if_true:
files('arm_gicv3_cpuif_common.c'))
specific_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true:
files('arm_gicv3_cpuif.c'))
specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'))
specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true:
files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c'))
specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c'))
-specific_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c'))
specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))
specific_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c'))
specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true:
files('loongson_liointc.c'))
specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gic.c'))
-specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c'))
specific_ss.add(when: 'CONFIG_OMPIC', if_true: files('ompic.c'))
specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_OPENPIC'],
if_true: files('openpic_kvm.c'))
specific_ss.add(when: 'CONFIG_POWERNV', if_true: files('xics_pnv.c',
'pnv_xive.c', 'pnv_xive2.c'))
specific_ss.add(when: 'CONFIG_PPC_UIC', if_true: files('ppc-uic.c'))
-specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c',
'bcm2836_control.c'))
specific_ss.add(when: 'CONFIG_RX_ICU', if_true: files('rx_icu.c'))
specific_ss.add(when: 'CONFIG_S390_FLIC', if_true: files('s390_flic.c'))
specific_ss.add(when: 'CONFIG_S390_FLIC_KVM', if_true:
files('s390_flic_kvm.c'))
--
2.38.1
- [PULL 00/15] Trivial branch for 8.0 patches, Laurent Vivier, 2023/01/18
- [PULL 03/15] hw/intc: Move some files out of the target-specific source set, Laurent Vivier, 2023/01/18
- [PULL 02/15] hw/display: Move omap_lcdc.c out of target-specific source set, Laurent Vivier, 2023/01/18
- [PULL 04/15] hw/tpm: Move tpm_ppi.c out of target-specific source set, Laurent Vivier, 2023/01/18
- [PULL 06/15] hw/cpu: Mark arm11 and realview mpcore as target-independent code, Laurent Vivier, 2023/01/18
- [PULL 05/15] hw/arm: Move various units to softmmu_ss[], Laurent Vivier, 2023/01/18
- [PULL 09/15] tests/qtest/test-hmp: Improve the check for verbose mode, Laurent Vivier, 2023/01/18
- [PULL 08/15] hw/usb: Mark the XLNX_VERSAL-related files as target-independent, Laurent Vivier, 2023/01/18
- [PULL 07/15] hw/intc: Mark more interrupt-controller files as target independent,
Laurent Vivier <=
- [PULL 10/15] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init, Laurent Vivier, 2023/01/18
- [PULL 12/15] hw/pvrdma: Protect against buggy or malicious guest driver, Laurent Vivier, 2023/01/18
- [PULL 11/15] ccid-card-emulated: fix cast warning/error, Laurent Vivier, 2023/01/18
- [PULL 13/15] hw/cxl/cxl-cdat.c: spelling: missmatch, Laurent Vivier, 2023/01/18
- [PULL 14/15] hw/cxl/cxl-host: Fix an error message typo, Laurent Vivier, 2023/01/18
- [PULL 01/15] Call qemu_socketpair() instead of socketpair() when possible, Laurent Vivier, 2023/01/18
- [PULL 15/15] hw/ssi/sifive_spi.c: spelling: reigster, Laurent Vivier, 2023/01/18
- Re: [PULL 00/15] Trivial branch for 8.0 patches, Peter Maydell, 2023/01/19