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=1576158763; cv=none; d=zohomail.com; s=zohoarc; b=IES/j9UH1Zkbk3jxwkDlR8Hw9e2E1o1NXx2xgCgXDpoMm2m1IpB48DDEX29bu9IS4AXZ0db+WShANLtf6AF3t4QzbVMd7YHdb76GIRBhIGk52PRyPLZht8CriOcxZ4lo4xvZ55NHf3d55QuiMJyGsmo0FHh/PE9GlUOpcz552+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576158763; 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=lvgh+zBmcPIkOu0PE+ZarIMV7ERHiR4np+NUTMKTHqo=; b=fNyKWLaGw9Tvv7cb98gstf1q3zFNaJukzMGFSwt3u+G3UPHV1tcrJn7v01VcIslbxNpIhBQghzY2G9zJ00AzeCbgFuZch4+egoqbFeIU4SZrkPNXCPmQg6qLzza7Zt/ocupZ4+bjsh2qWFBOpNVm2CMdvLvE0Z5DoF2CRsrkDhg= 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 1576158763975286.7732458246537; Thu, 12 Dec 2019 05:52:43 -0800 (PST) Received: from localhost ([::1]:59582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOtW-0008QL-AV for importer@patchew.org; Thu, 12 Dec 2019 08:52:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42030) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz6-0004gH-Uu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz5-00089D-4p for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:24 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:33956) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz4-000886-TR for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:23 -0500 Received: by mail-wm1-x333.google.com with SMTP id f4so3557821wmj.1 for ; Thu, 12 Dec 2019 04:54:22 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:20 -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=lvgh+zBmcPIkOu0PE+ZarIMV7ERHiR4np+NUTMKTHqo=; b=Mqf50fW4OxW24TolMZ37YcIheXsrd9uEMXhBiiUXCHLGIZ1uFtIYC2DYIEFMoSMcoE jHT4yqUYvr0/3D5JZuW3SyYlLd+1V5gRcy5gBy658Yht/koPRpLuvbdqbBzL6SzMJdik u5ab3MJkyNEp8lFB3nCqripIHenTyMusiSvXeL9Vsbjz3xDpasQNNfiQl1f5crH80w/a HgI+EbBEQiDs4gjgUJFXHaCLW0BbChx5OZvlJR4ayqUOxtyEC+yaa3ABC0VXZgzo58Wi 6k1ZKKEE3skxDNyKy2L6yoC7sgMnJFyxQcllhHBz/aFTxWAez2H35yOSQwntAGuX55HV fDdw== 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=lvgh+zBmcPIkOu0PE+ZarIMV7ERHiR4np+NUTMKTHqo=; b=lF1wApWJRUSC1kvzY25ombR+XfEcdPY/VHHE5EioUQz2fv/IAVdIhUV6/Z53k7STM7 Gpgzrzz84EuuNkGQ1lspnYuoG7V1JRShj6zRQMz0o3yopTX7Fnf2lsjBXbraJ47GO6Y5 ZVr28l6OAO+4FJshn/ysBhnQKgK9CoeltVZSQrlE/tYmgFzg/541kMP8qgECA7dNH4eR Lyinhc5hfpZIFZx/k161tLGYPYYur0myg6Bl7jsAFtEYNSiJZOB6/bjviULUH/IVP+5n mZJmT+cRvnP8QwOQMuC2eQxI4BJmKd++RcSrxO1LSvSwYAtQ2CcPcAGuB9YDaCL/RDtS rgbg== X-Gm-Message-State: APjAAAXikLrAXsyzpN3/m/nIacgbtIviXHpW2Gq3s88ZI4MgfaY0Nkmn DD3wGxBQcJvnvQYnujvbtWdQOPUP X-Google-Smtp-Source: APXvYqxihiIlbVuHBJGV4iejN9DA35PUkMq4VrdhXvWmeHN85MNYKQrEAWS3N6wH3K/P8HX5GDMGHg== X-Received: by 2002:a7b:c8c7:: with SMTP id f7mr6453330wml.91.1576155261646; Thu, 12 Dec 2019 04:54:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 084/132] meson: convert hw/misc Date: Thu, 12 Dec 2019 13:52:08 +0100 Message-Id: <1576155176-2464-85-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::333 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/meson.build | 1 + hw/misc/Makefile.objs | 82 -----------------------------------------= ---- hw/misc/macio/Makefile.objs | 5 --- hw/misc/macio/meson.build | 8 +++++ hw/misc/meson.build | 79 +++++++++++++++++++++++++++++++++++++++++= ++ 6 files changed, 88 insertions(+), 88 deletions(-) delete mode 100644 hw/misc/Makefile.objs delete mode 100644 hw/misc/macio/Makefile.objs create mode 100644 hw/misc/macio/meson.build create mode 100644 hw/misc/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d9479e3..e630c54 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -18,7 +18,6 @@ devices-dirs-y +=3D intc/ devices-dirs-$(CONFIG_IPACK) +=3D ipack/ devices-dirs-$(CONFIG_IPMI) +=3D ipmi/ devices-dirs-y +=3D isa/ -devices-dirs-y +=3D misc/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 3b20fea..c83f37c 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('misc') subdir('net') subdir('nvram') subdir('pci') diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs deleted file mode 100644 index e4aad70..0000000 --- a/hw/misc/Makefile.objs +++ /dev/null @@ -1,82 +0,0 @@ -common-obj-$(CONFIG_APPLESMC) +=3D applesmc.o -common-obj-$(CONFIG_MAX111X) +=3D max111x.o -common-obj-$(CONFIG_TMP105) +=3D tmp105.o -common-obj-$(CONFIG_TMP421) +=3D tmp421.o -common-obj-$(CONFIG_ISA_DEBUG) +=3D debugexit.o -common-obj-$(CONFIG_SGA) +=3D sga.o -common-obj-$(CONFIG_ISA_TESTDEV) +=3D pc-testdev.o -common-obj-$(CONFIG_PCI_TESTDEV) +=3D pci-testdev.o -common-obj-$(CONFIG_EDU) +=3D edu.o -common-obj-$(CONFIG_PCA9552) +=3D pca9552.o - -common-obj-$(CONFIG_UNIMP) +=3D unimp.o -common-obj-$(CONFIG_FW_CFG_DMA) +=3D vmcoreinfo.o - -# ARM devices -common-obj-$(CONFIG_PL310) +=3D arm_l2x0.o -common-obj-$(CONFIG_INTEGRATOR_DEBUG) +=3D arm_integrator_debug.o -common-obj-$(CONFIG_A9SCU) +=3D a9scu.o -common-obj-$(CONFIG_ARM11SCU) +=3D arm11scu.o - -# Mac devices -common-obj-$(CONFIG_MOS6522) +=3D mos6522.o - -# PKUnity SoC devices -common-obj-$(CONFIG_PUV3) +=3D puv3_pm.o - -common-obj-$(CONFIG_MACIO) +=3D macio/ - -obj-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem.o - -obj-$(CONFIG_REALVIEW) +=3D arm_sysctl.o -obj-$(CONFIG_NSERIES) +=3D cbus.o -obj-$(CONFIG_ECCMEMCTL) +=3D eccmemctl.o -obj-$(CONFIG_EXYNOS4) +=3D exynos4210_pmu.o exynos4210_clk.o exynos4210_rn= g.o -obj-$(CONFIG_IMX) +=3D imx_ccm.o -obj-$(CONFIG_IMX) +=3D imx31_ccm.o -obj-$(CONFIG_IMX) +=3D imx25_ccm.o -obj-$(CONFIG_IMX) +=3D imx6_ccm.o -obj-$(CONFIG_IMX) +=3D imx6ul_ccm.o -obj-$(CONFIG_IMX) +=3D imx6_src.o -obj-$(CONFIG_IMX) +=3D imx7_ccm.o -obj-$(CONFIG_IMX) +=3D imx2_wdt.o -obj-$(CONFIG_IMX) +=3D imx7_snvs.o -obj-$(CONFIG_IMX) +=3D imx7_gpr.o -obj-$(CONFIG_MILKYMIST) +=3D milkymist-hpdmc.o -obj-$(CONFIG_MILKYMIST) +=3D milkymist-pfpu.o -obj-$(CONFIG_MAINSTONE) +=3D mst_fpga.o -obj-$(CONFIG_OMAP) +=3D omap_clk.o -obj-$(CONFIG_OMAP) +=3D omap_gpmc.o -obj-$(CONFIG_OMAP) +=3D omap_l4.o -obj-$(CONFIG_OMAP) +=3D omap_sdrc.o -obj-$(CONFIG_OMAP) +=3D omap_tap.o -obj-$(CONFIG_RASPI) +=3D bcm2835_mbox.o -obj-$(CONFIG_RASPI) +=3D bcm2835_property.o -obj-$(CONFIG_RASPI) +=3D bcm2835_rng.o -obj-$(CONFIG_SLAVIO) +=3D slavio_misc.o -obj-$(CONFIG_ZYNQ) +=3D zynq_slcr.o -obj-$(CONFIG_ZYNQ) +=3D zynq-xadc.o -obj-$(CONFIG_STM32F2XX_SYSCFG) +=3D stm32f2xx_syscfg.o -obj-$(CONFIG_MIPS_CPS) +=3D mips_cmgcr.o -obj-$(CONFIG_MIPS_CPS) +=3D mips_cpc.o -obj-$(CONFIG_MIPS_ITU) +=3D mips_itu.o -obj-$(CONFIG_MPS2_FPGAIO) +=3D mps2-fpgaio.o -obj-$(CONFIG_MPS2_SCC) +=3D mps2-scc.o - -obj-$(CONFIG_TZ_MPC) +=3D tz-mpc.o -obj-$(CONFIG_TZ_MSC) +=3D tz-msc.o -obj-$(CONFIG_TZ_PPC) +=3D tz-ppc.o -obj-$(CONFIG_IOTKIT_SECCTL) +=3D iotkit-secctl.o -obj-$(CONFIG_IOTKIT_SYSCTL) +=3D iotkit-sysctl.o -obj-$(CONFIG_IOTKIT_SYSINFO) +=3D iotkit-sysinfo.o -obj-$(CONFIG_ARMSSE_CPUID) +=3D armsse-cpuid.o -obj-$(CONFIG_ARMSSE_MHU) +=3D armsse-mhu.o - -obj-$(CONFIG_PVPANIC) +=3D pvpanic.o -obj-$(CONFIG_AUX) +=3D auxbus.o -obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_xdma.o -obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_scu.o aspeed_sdmc.o -obj-$(CONFIG_MSF2) +=3D msf2-sysreg.o -obj-$(CONFIG_NRF51_SOC) +=3D nrf51_rng.o - -obj-$(CONFIG_GRLIB) +=3D grlib_ahb_apb_pnp.o diff --git a/hw/misc/macio/Makefile.objs b/hw/misc/macio/Makefile.objs deleted file mode 100644 index 07fdb32..0000000 --- a/hw/misc/macio/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -common-obj-y +=3D macio.o -common-obj-$(CONFIG_CUDA) +=3D cuda.o -common-obj-$(CONFIG_MAC_PMU) +=3D pmu.o -common-obj-$(CONFIG_MAC_DBDMA) +=3D mac_dbdma.o -common-obj-$(CONFIG_MACIO_GPIO) +=3D gpio.o diff --git a/hw/misc/macio/meson.build b/hw/misc/macio/meson.build new file mode 100644 index 0000000..17282da --- /dev/null +++ b/hw/misc/macio/meson.build @@ -0,0 +1,8 @@ +macio_ss =3D ss.source_set() +macio_ss.add(files('macio.c')) +macio_ss.add(when: 'CONFIG_CUDA', if_true: files('cuda.c')) +macio_ss.add(when: 'CONFIG_MACIO_GPIO', if_true: files('gpio.c')) +macio_ss.add(when: 'CONFIG_MAC_DBDMA', if_true: files('mac_dbdma.c')) +macio_ss.add(when: 'CONFIG_MAC_PMU', if_true: files('pmu.c')) + +softmmu_ss.add_all(when: 'CONFIG_MACIO', if_true: macio_ss) diff --git a/hw/misc/meson.build b/hw/misc/meson.build new file mode 100644 index 0000000..8a971b4 --- /dev/null +++ b/hw/misc/meson.build @@ -0,0 +1,79 @@ +softmmu_ss.add(when: 'CONFIG_APPLESMC', if_true: files('applesmc.c')) +softmmu_ss.add(when: 'CONFIG_EDU', if_true: files('edu.c')) +softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c')) +softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c')) +softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c')) +softmmu_ss.add(when: 'CONFIG_MAX111X', if_true: files('max111x.c')) +softmmu_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) +softmmu_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c')) +softmmu_ss.add(when: 'CONFIG_SGA', if_true: files('sga.c')) +softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c')) +softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c')) +softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) + +# ARM devices +softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c')) +softmmu_ss.add(when: 'CONFIG_INTEGRATOR_DEBUG', if_true: files('arm_integr= ator_debug.c')) +softmmu_ss.add(when: 'CONFIG_A9SCU', if_true: files('a9scu.c')) +softmmu_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('arm11scu.c')) + +# Mac devices +softmmu_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c')) + +# PKUnity SoC devices +softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_pm.c')) + +subdir('macio') + +specific_ss.add(when: 'CONFIG_IVSHMEM_DEVICE', if_true: files('ivshmem.c')) + +specific_ss.add(when: 'CONFIG_REALVIEW', if_true: files('arm_sysctl.c')) +specific_ss.add(when: 'CONFIG_NSERIES', if_true: files('cbus.c')) +specific_ss.add(when: 'CONFIG_ECCMEMCTL', if_true: files('eccmemctl.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pmu.c',= 'exynos4210_clk.c', 'exynos4210_rng.c')) +specific_ss.add(when: 'CONFIG_IMX', if_true: files( + 'imx25_ccm.c', + 'imx2_wdt.c', + 'imx31_ccm.c', + 'imx6_ccm.c', + 'imx6_src.c', + 'imx6ul_ccm.c', + 'imx7_ccm.c', + 'imx7_gpr.c', + 'imx7_snvs.c', + 'imx_ccm.c', +)) +specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-hpdmc.= c', 'milkymist-pfpu.c')) +specific_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mst_fpga.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files( + 'omap_clk.c', + 'omap_gpmc.c', + 'omap_l4.c', + 'omap_sdrc.c', + 'omap_tap.c', +)) +specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_mbox.c', 'bc= m2835_property.c', 'bcm2835_rng.c')) +specific_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c')) +specific_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c', 'zynq-x= adc.c')) +specific_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx= _syscfg.c')) +specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'm= ips_cpc.c')) +specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c')) +specific_ss.add(when: 'CONFIG_MPS2_FPGAIO', if_true: files('mps2-fpgaio.c'= )) +specific_ss.add(when: 'CONFIG_MPS2_SCC', if_true: files('mps2-scc.c')) + +specific_ss.add(when: 'CONFIG_TZ_MPC', if_true: files('tz-mpc.c')) +specific_ss.add(when: 'CONFIG_TZ_MSC', if_true: files('tz-msc.c')) +specific_ss.add(when: 'CONFIG_TZ_PPC', if_true: files('tz-ppc.c')) +specific_ss.add(when: 'CONFIG_IOTKIT_SECCTL', if_true: files('iotkit-secct= l.c')) +specific_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysct= l.c')) +specific_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysi= nfo.c')) +specific_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.= c')) +specific_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c')) + +specific_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) +specific_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c')) +specific_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', = 'aspeed_sdmc.c', 'aspeed_xdma.c')) +specific_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c')) +specific_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c')) + +specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'= )) --=20 1.8.3.1