From nobody Mon Feb 9 12:14:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576159382; cv=none; d=zohomail.com; s=zohoarc; b=hAk//I+AyXDuhr/p+keyU4GFR/0QD79I0psj0Iae3CnlHaz0REZGpe7Pw2PlSmvUMROl1LdKucgodAoN23GZBxrhJ4//ARl6i0IT4zyNilgozNN2lvqJPyV2N1JJ3t3WbFmBjFsHdjz2oYHsSQA4Qgyc1eVPQdSiQ3ukpKQwYi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576159382; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yvhzPXCU/CtE3qvXs+MVaNi1CSZGrYTGkfoEQFgKHMM=; b=ElLf0kucuYGKN8AHeIifmEEzpsEQDot0uCJu31h7bL9jfkNnWlD/oHQfMBVH73quEJKeOjMljDAW2myhpp4MTO1/330fvWuDykp2y+ayWG6m0nza3Xiw0tX4dRWUHCN59a5o/Lk0mMBND0KGWwcLMHosG52LHh4z5NcZvsiPnD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576159382431172.86252355469594; Thu, 12 Dec 2019 06:03:02 -0800 (PST) Received: from localhost ([::1]:59808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP3U-0004ya-LB for importer@patchew.org; Thu, 12 Dec 2019 09:03:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42576) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNzA-0004mH-PW for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz9-0008Fc-38 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:28 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34270) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz8-0008EW-SF for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:27 -0500 Received: by mail-wr1-x444.google.com with SMTP id t2so2647209wrr.1 for ; Thu, 12 Dec 2019 04:54:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yvhzPXCU/CtE3qvXs+MVaNi1CSZGrYTGkfoEQFgKHMM=; b=Dzt334haj4r1KsBiaLkcAscYkAbtBeUwx1EX7UmAH54Dvbq5M7s6Y7fC2cjNjn1FsL WB5sbGy/kxxJmerZr5YdkLHNPl83FZTyqoz0rgYkyqN3Wc0RHAs/1yw2q67QHduaZaYD Q/EBZiNeQpeFQdRNXxRp7bnQUBSw393NBKLnSi1n8O26GamhWISYkp/Vm4K440m6KqmO W1mMOXwFGXHUX+gpC5y0UXbI97I9bJA/vFQvYcNZ6SIffOgcuKVssjWl7BF7BPSBMU61 QNjLnMVjwlMWqVgwDgoieXVE1HZKylmDSbEeTURFHC+wSlSn8/7I98qfJ1uewFMT/9nK fDUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=yvhzPXCU/CtE3qvXs+MVaNi1CSZGrYTGkfoEQFgKHMM=; b=H00mvrSFdeQw7rQltOVBRwIbHDpM0QwztJjxIWqiy8Ygo/+YzD91G7MHeXnalGCu+p HLqluV0/OmxIuyAGRE1t+vWqNst9I2OFfPPRfXT+gL1ToT3aINvb6Q1Jc/pgUN1P+r8k 8ZA30HKZ/zXdhA44u+JjZsYvbCDVxoHD523H0EhYUPftSvQT8/1goMXMsldSdobQUfNt 6mjjOSkP44i1mISz5wEgV1HbQnQkkUMy+H6blc+XrC0O4IQ51Qqbpsl/DLLA7psi2mS0 tOhT2dp82omRj1umDyb+WrLSF28sLbjLkzs1u/EBkMw+23BzUaQCve+/gO0PSew7DMF5 imzA== X-Gm-Message-State: APjAAAU6Tm2GVxyUyOR0BhzfVHtEZ8NwBI2BJk1HDVVa785HkRemd+AD zZbhmRJyg0F0lYX9IIRV9YAIZYT/ X-Google-Smtp-Source: APXvYqwqXIvt+ezk0EX/JonqEnY45tTi95rZlOVziYhZvXt/izlucg8J74HwhE+jFsiNMjUCb9NBEw== X-Received: by 2002:a5d:514a:: with SMTP id u10mr6036315wrt.169.1576155265590; Thu, 12 Dec 2019 04:54:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 088/132] meson: convert hw/intc Date: Thu, 12 Dec 2019 13:52:12 +0100 Message-Id: <1576155176-2464-89-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/Makefile.objs | 1 - hw/intc/Makefile.objs | 51 -----------------------------------------------= --- hw/intc/meson.build | 52 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ hw/meson.build | 1 + 4 files changed, 53 insertions(+), 52 deletions(-) delete mode 100644 hw/intc/Makefile.objs create mode 100644 hw/intc/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 8697b42..c89ca8d 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -14,7 +14,6 @@ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ devices-dirs-$(CONFIG_I2C) +=3D i2c/ devices-dirs-y +=3D ide/ devices-dirs-y +=3D input/ -devices-dirs-y +=3D intc/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs deleted file mode 100644 index f726d87..0000000 --- a/hw/intc/Makefile.objs +++ /dev/null @@ -1,51 +0,0 @@ -common-obj-$(CONFIG_HEATHROW_PIC) +=3D heathrow_pic.o -common-obj-$(CONFIG_I8259) +=3D i8259_common.o i8259.o -common-obj-$(CONFIG_PL190) +=3D pl190.o -common-obj-$(CONFIG_PUV3) +=3D puv3_intc.o -common-obj-$(CONFIG_XILINX) +=3D xilinx_intc.o -common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) +=3D xlnx-pmu-iomod-intc.o -common-obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp-ipi.o -common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_pic.o -common-obj-$(CONFIG_IMX) +=3D imx_avic.o imx_gpcv2.o -common-obj-$(CONFIG_LM32) +=3D lm32_pic.o -common-obj-$(CONFIG_REALVIEW) +=3D realview_gic.o -common-obj-$(CONFIG_SLAVIO) +=3D slavio_intctl.o -common-obj-$(CONFIG_IOAPIC) +=3D ioapic_common.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gic_common.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gic.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv2m.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_common.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_dist.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_redist.o -common-obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_its_common.o -common-obj-$(CONFIG_OPENPIC) +=3D openpic.o -common-obj-y +=3D intc.o - -obj-$(CONFIG_APIC) +=3D apic.o apic_common.o -obj-$(CONFIG_ARM_GIC_KVM) +=3D arm_gic_kvm.o -obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) +=3D arm_gicv3_kv= m.o -obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) +=3D arm_gicv3_it= s_kvm.o -obj-$(CONFIG_ARM_V7M) +=3D armv7m_nvic.o -obj-$(CONFIG_EXYNOS4) +=3D exynos4210_gic.o exynos4210_combiner.o -obj-$(CONFIG_GRLIB) +=3D grlib_irqmp.o -obj-$(CONFIG_IOAPIC) +=3D ioapic.o -obj-$(CONFIG_OMAP) +=3D omap_intc.o -obj-$(CONFIG_OPENPIC_KVM) +=3D openpic_kvm.o -obj-$(CONFIG_RASPI) +=3D bcm2835_ic.o bcm2836_control.o -obj-$(CONFIG_SH4) +=3D sh_intc.o -obj-$(CONFIG_XICS) +=3D xics.o -obj-$(CONFIG_XICS_SPAPR) +=3D xics_spapr.o -obj-$(CONFIG_XICS_KVM) +=3D xics_kvm.o -obj-$(CONFIG_XIVE) +=3D xive.o -obj-$(CONFIG_XIVE_SPAPR) +=3D spapr_xive.o -obj-$(CONFIG_XIVE_KVM) +=3D spapr_xive_kvm.o -obj-$(CONFIG_POWERNV) +=3D xics_pnv.o pnv_xive.o -obj-$(CONFIG_ALLWINNER_A10_PIC) +=3D allwinner-a10-pic.o -obj-$(CONFIG_S390_FLIC) +=3D s390_flic.o -obj-$(CONFIG_S390_FLIC_KVM) +=3D s390_flic_kvm.o -obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_vic.o -obj-$(CONFIG_ARM_GIC) +=3D arm_gicv3_cpuif.o -obj-$(CONFIG_MIPS_CPS) +=3D mips_gic.o -obj-$(CONFIG_NIOS2) +=3D nios2_iic.o -obj-$(CONFIG_OMPIC) +=3D ompic.o diff --git a/hw/intc/meson.build b/hw/intc/meson.build new file mode 100644 index 0000000..a2e5314 --- /dev/null +++ b/hw/intc/meson.build @@ -0,0 +1,52 @@ +softmmu_ss.add(files('intc.c')) +softmmu_ss.add(when: 'CONFIG_ARM_GIC', if_true: files( + 'arm_gic.c', + 'arm_gic_common.c', + 'arm_gicv2m.c', + 'arm_gicv3.c', + 'arm_gicv3_common.c', + 'arm_gicv3_dist.c', + 'arm_gicv3_its_common.c', + 'arm_gicv3_redist.c', +)) +softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c')) +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', 'i82= 59.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_LM32', if_true: files('lm32_pic.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_PUV3', if_true: files('puv3_intc.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')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-ipi= .c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-pmu-io= mod-intc.c')) + +specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinne= r-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.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: f= iles('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_EXYNOS4', if_true: files('exynos4210_gic.c',= 'exynos4210_combiner.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_MIPS_CPS', if_true: files('mips_gic.c')) +specific_ss.add(when: 'CONFIG_NIOS2', if_true: files('nios2_iic.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_OPENPIC_KVM', if_true: files('openpic_kvm.c'= )) +specific_ss.add(when: 'CONFIG_POWERNV', if_true: files('xics_pnv.c', 'pnv_= xive.c')) +specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2= 836_control.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_kv= m.c')) +specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_intc.c')) +specific_ss.add(when: 'CONFIG_XICS', if_true: files('xics.c')) +specific_ss.add(when: 'CONFIG_XICS_KVM', if_true: files('xics_kvm.c')) +specific_ss.add(when: 'CONFIG_XICS_SPAPR', if_true: files('xics_spapr.c')) +specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c')) +specific_ss.add(when: 'CONFIG_XIVE_KVM', if_true: files('spapr_xive_kvm.c'= )) +specific_ss.add(when: 'CONFIG_XIVE_SPAPR', if_true: files('spapr_xive.c')) diff --git a/hw/meson.build b/hw/meson.build index 3e3f090..a5032d3 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('intc') subdir('ipack') subdir('ipmi') subdir('isa') --=20 1.8.3.1