From nobody Mon Feb 9 18:44:25 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=1576158439; cv=none; d=zohomail.com; s=zohoarc; b=PlSH4lnPyB42EiUCaHC3rDfZVgVdqLbXxwSbj585XMB/IvVoknMoJudTCrbWjFcvYbaE3dkwR4FlQ06tc/YCYOSU0KKOLLCttYNeXvQ2o0sj7sKEC51NCJ84V9vUAU1rWXF5nMkucAbVbCiuEtoOJ5FpA1pqjO4ZBqhkpLG4HCc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576158439; 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=yXQbJKsvQk7oYU4KlgfGRW1DYvBILSdETOHeXV/ZcBk=; b=blsfUFnFwa145RQtdV5+bMFe0Ha5ZN9zA2/DV4CKQFvnj7+HKKooeBCOjOy7RM1iOn59ss3wpE06cf+X5oqdTcwxi8M9um8CFAg7x7GHv7WDHxlqt4gFHDfsRG/fXaXpF4U0RiIC6cFkiYvB7pDe7Aa/KlkN7/vJh4mICFTJtIA= 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 157615843906863.38464980886522; Thu, 12 Dec 2019 05:47:19 -0800 (PST) Received: from localhost ([::1]:59530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOoG-0002C2-5d for importer@patchew.org; Thu, 12 Dec 2019 08:47:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40360) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyw-0004Oq-5j for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyu-0007rt-LB for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:14 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37696) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyu-0007qZ-DW for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:12 -0500 Received: by mail-wr1-x436.google.com with SMTP id w15so2627269wru.4 for ; Thu, 12 Dec 2019 04:54:12 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:10 -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=yXQbJKsvQk7oYU4KlgfGRW1DYvBILSdETOHeXV/ZcBk=; b=eA4fCgYsbDn5WshczUK/HB7vxAdbF5kfSLKk29e3VQX8jEjcU+THyBWH8JSQKjdgZj 3gk4w1KlIIwjrD90XOsoGpgnDNHAAiSp2IpK1L5OkZ8KH9KMgkDApYsmWsWYTuExt/j/ xXiSCd9PDQb5UL5wsogcs6rykus553SwNNQc6kelzBDKiERo+t/ac2sDK2HkU5j7xS6T LuTG3g9jAmEjuj1UYrrpeWUIyD13XfQcg/iSFayJU9XhDousxN3CjGnTYWe4o+n8nWWX ExVzqA7/LS+8RjZRH9kVrfBgkd30JStLPUkDe3fP1VQ0KKR0puR3/Od1bwnl9EWKrDGF C3pA== 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=yXQbJKsvQk7oYU4KlgfGRW1DYvBILSdETOHeXV/ZcBk=; b=ClC1P9wIkgu9V31eCqkm3NLvOujAb0FrMDfVbprKymMxvQdmmg7po4wWLL8SbMrMLE i+41KvNuzbcY+LJZKgHYRt5OgCbnBQs5Vv3e1/v8y9Ca4GMvmkrDK/u2+9N5BcIyq/AA ivIL1jJHeC+Qhcsqr1TpOZ9olNAgCdC/f6zSaHtgITc3bd+HShQcnIjLowhADBHesR5T ao+Ma7hIB3eoAh+V5RIUaRwZ7CVL9yrAo1LgnrsE9b4DCvW3zH9JSDpEwrWIpZkJuZdK 0w0YsPKsWPavbxEYSOfRsv34PQnARfyphCsrvtA3RglQBgtD5jfd3sEMUUtLjfQ67qUz Vk0A== X-Gm-Message-State: APjAAAWxKJ1pH9CinfMEVMi7wLQxIsQpFtMrvoWKdRmvkbxaZvDF0gcu 7BQ/3Tej2ex5vnMrn9izbDHtTRb1 X-Google-Smtp-Source: APXvYqzZFA2cbfILZ0V7dqEr89xknJm/YKmcImxw7iWsKLY/rjl07OrvuqjZy5oonJfpDFqNH//KIA== X-Received: by 2002:adf:e3d0:: with SMTP id k16mr6303203wrm.241.1576155251115; Thu, 12 Dec 2019 04:54:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 073/132] meson: convert hw/timer Date: Thu, 12 Dec 2019 13:51:57 +0100 Message-Id: <1576155176-2464-74-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::436 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/timer/Makefile.objs | 49 ----------------------------------------------= --- hw/timer/meson.build | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 50 deletions(-) delete mode 100644 hw/timer/Makefile.objs create mode 100644 hw/timer/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 6529617..1d47113 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -28,7 +28,6 @@ devices-dirs-y +=3D pcmcia/ devices-dirs-$(CONFIG_SCSI) +=3D scsi/ devices-dirs-y +=3D sd/ devices-dirs-y +=3D ssi/ -devices-dirs-y +=3D timer/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 4e918d0..960fd14 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') subdir('semihosting') subdir('smbios') +subdir('timer') subdir('tpm') subdir('usb') subdir('vfio') diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs deleted file mode 100644 index 123d92c..0000000 --- a/hw/timer/Makefile.objs +++ /dev/null @@ -1,49 +0,0 @@ -common-obj-$(CONFIG_ARM_TIMER) +=3D arm_timer.o -common-obj-$(CONFIG_ARM_MPTIMER) +=3D arm_mptimer.o -common-obj-$(CONFIG_ARM_V7M) +=3D armv7m_systick.o -common-obj-$(CONFIG_A9_GTIMER) +=3D a9gtimer.o -common-obj-$(CONFIG_CADENCE) +=3D cadence_ttc.o -common-obj-$(CONFIG_DS1338) +=3D ds1338.o -common-obj-$(CONFIG_HPET) +=3D hpet.o -common-obj-$(CONFIG_I8254) +=3D i8254_common.o i8254.o -common-obj-$(CONFIG_M41T80) +=3D m41t80.o -common-obj-$(CONFIG_M48T59) +=3D m48t59.o -ifeq ($(CONFIG_ISA_BUS),y) -common-obj-$(CONFIG_M48T59) +=3D m48t59-isa.o -endif -common-obj-$(CONFIG_PL031) +=3D pl031.o -common-obj-$(CONFIG_PUV3) +=3D puv3_ost.o -common-obj-$(CONFIG_TWL92230) +=3D twl92230.o -common-obj-$(CONFIG_XILINX) +=3D xilinx_timer.o -common-obj-$(CONFIG_SLAVIO) +=3D slavio_timer.o -common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_timer.o -common-obj-$(CONFIG_GRLIB) +=3D grlib_gptimer.o -common-obj-$(CONFIG_IMX) +=3D imx_epit.o -common-obj-$(CONFIG_IMX) +=3D imx_gpt.o -common-obj-$(CONFIG_LM32) +=3D lm32_timer.o -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-sysctl.o -common-obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp-rtc.o -common-obj-$(CONFIG_NRF51_SOC) +=3D nrf51_timer.o - -obj-$(CONFIG_ALTERA_TIMER) +=3D altera_timer.o -obj-$(CONFIG_EXYNOS4) +=3D exynos4210_mct.o -obj-$(CONFIG_EXYNOS4) +=3D exynos4210_pwm.o -obj-$(CONFIG_EXYNOS4) +=3D exynos4210_rtc.o -obj-$(CONFIG_OMAP) +=3D omap_gptimer.o -obj-$(CONFIG_OMAP) +=3D omap_synctimer.o -obj-$(CONFIG_PXA2XX) +=3D pxa2xx_timer.o -obj-$(CONFIG_SH4) +=3D sh_timer.o -obj-$(CONFIG_DIGIC) +=3D digic-timer.o -obj-$(CONFIG_MIPS_CPS) +=3D mips_gictimer.o - -obj-$(CONFIG_MC146818RTC) +=3D mc146818rtc.o - -obj-$(CONFIG_ALLWINNER_A10_PIT) +=3D allwinner-a10-pit.o - -common-obj-$(CONFIG_STM32F2XX_TIMER) +=3D stm32f2xx_timer.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_timer.o aspeed_rtc.o - -common-obj-$(CONFIG_SUN4V_RTC) +=3D sun4v-rtc.o -common-obj-$(CONFIG_CMSDK_APB_TIMER) +=3D cmsdk-apb-timer.o -common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) +=3D cmsdk-apb-dualtimer.o -common-obj-$(CONFIG_MSF2) +=3D mss-timer.o diff --git a/hw/timer/meson.build b/hw/timer/meson.build new file mode 100644 index 0000000..5162b9b --- /dev/null +++ b/hw/timer/meson.build @@ -0,0 +1,43 @@ +softmmu_ss.add(when: 'CONFIG_A9_GTIMER', if_true: files('a9gtimer.c')) +softmmu_ss.add(when: 'CONFIG_ARM_MPTIMER', if_true: files('arm_mptimer.c')) +softmmu_ss.add(when: 'CONFIG_ARM_TIMER', if_true: files('arm_timer.c')) +softmmu_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_systick.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_rtc.c', '= aspeed_timer.c')) +softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_ttc.c')) +softmmu_ss.add(when: 'CONFIG_CMSDK_APB_DUALTIMER', if_true: files('cmsdk-a= pb-dualtimer.c')) +softmmu_ss.add(when: 'CONFIG_CMSDK_APB_TIMER', if_true: files('cmsdk-apb-t= imer.c')) +softmmu_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c')) +softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_timer.c')) +softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c')) +softmmu_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c')) +softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i82= 54.c')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c')) +softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_timer.c')) +softmmu_ss.add(when: 'CONFIG_M41T80', if_true: files('m41t80.c')) +softmmu_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c')) +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-sysctl.= c')) +softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c')) +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_timer.c')) +softmmu_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c')) +softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_ost.c')) +softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c')) +softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_t= imer.c')) +softmmu_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c')) +softmmu_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c')) +softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc= .c')) +softmmu_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('= m48t59-isa.c')) + +specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIT', if_true: files('allwinne= r-a10-pit.c')) +specific_ss.add(when: 'CONFIG_ALTERA_TIMER', if_true: files('altera_timer.= c')) +specific_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c')) +specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c')) +specific_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'= )) +specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gptimer.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c')) +specific_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c')) +specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_timer.c')) --=20 1.8.3.1