From nobody Tue Dec 16 08:32:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597082703; cv=none; d=zohomail.com; s=zohoarc; b=R8NNi7I/BveaWHkeSeEq4qFJsrz4HilILYbS5/U4iFYx+30/xuwf1qqNIDYEEC6DpSqWUntJLQVpNpgkB8YKFXaPhWq7kuQ299H1kdQwwXs1KVwoPtLG5o3k4jp20EsRNgkIdLAOnlPo007KUv/ix3pXKIgeYHxrGzy17EqYCJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082703; h=Content-Type:Content-Transfer-Encoding:Cc: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=EC/XPUAop3rV2Wbzm8z2tnnzIvn+p4q70kl28D8LflU=; b=H7gtk5mFgImGQIDM8Vp1cgZ2aJgxybQ7v+Wl3zGIUhhTH0iYiyV14fJBaJNxEzIV1H+BQEpxcNQvKfseCFhf2Hur27QbzY3EtxVQU8x4H8bEzk3obBY0T7vCYA6bZALMrgd8HPZzr0GiX55fy2E+eiaOfvcHhY+MDESzjNlL+0c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1597082703398674.7146979273208; Mon, 10 Aug 2020 11:05:03 -0700 (PDT) Received: from localhost ([::1]:38616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CAQ-0003aB-7b for importer@patchew.org; Mon, 10 Aug 2020 14:05:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BLN-0002Xx-4o for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:17 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:46207 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BLJ-0003GF-Kc for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:12:16 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-51-D4VwUXz7OIip1fcugCVGGQ-1; Mon, 10 Aug 2020 13:12:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 539FD800473 for ; Mon, 10 Aug 2020 17:12:10 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 608CC5F1E9; Mon, 10 Aug 2020 17:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EC/XPUAop3rV2Wbzm8z2tnnzIvn+p4q70kl28D8LflU=; b=gaBq+rtzoZdr/+QJN8olpjVwIMN4YaLfkGjOQ0A2DCKlfLtjYJzLQUmidcah1zGOeZhwmY 7+W7JVxVU9eVQ6T9/8isVoeCa2m6PdQUGVtoshXVvp+zZP+EBMRMEngQCMDcQi26Mx4evy FKNc0bMkeJ2qbdRPcAKt49fTN9Wt+k4= X-MC-Unique: D4VwUXz7OIip1fcugCVGGQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 109/147] meson: convert hw/intc Date: Mon, 10 Aug 2020 19:08:27 +0200 Message-Id: <1597079345-42801-110-git-send-email-pbonzini@redhat.com> In-Reply-To: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> References: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 04:13:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/intc/Makefile.objs | 54 -----------------------------------------------= --- hw/intc/meson.build | 55 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ hw/meson.build | 1 + 4 files changed, 56 insertions(+), 55 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 76d9305..80b1041 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -13,7 +13,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 3ac2b40..0000000 --- a/hw/intc/Makefile.objs +++ /dev/null @@ -1,54 +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-$(CONFIG_RX_ICU) +=3D rx_icu.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 -obj-$(CONFIG_IBEX) +=3D ibex_plic.o -obj-$(CONFIG_LOONGSON_LIOINTC) +=3D loongson_liointc.o diff --git a/hw/intc/meson.build b/hw/intc/meson.build new file mode 100644 index 0000000..c16f7f0 --- /dev/null +++ b/hw/intc/meson.build @@ -0,0 +1,55 @@ +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_IBEX', if_true: files('ibex_plic.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_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_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_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 ec4bb48..986e710 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