From nobody Tue Dec 16 11:05:14 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=1597082334; cv=none; d=zohomail.com; s=zohoarc; b=MgzhRFCE0sdvzLQHrtG1hDk008TMKxeOGY/aOrOzF6uoOkawPwlwMgJCefGyOpRebZQXMLAUXjCdpFZ9lqBig1ZGMpkcUU5ntfkun3dHLWc1y8GlY/NOPmI5IvQi1lrEgAfcDxuGXlFuj+lutfpuS/yOy9OhEXFnZZ9NT6MaGpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082334; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=lMOKj2JUkDjiKQzhyDxdSKswLl4CNUMxR1j4M1JHaXA=; b=DOuNEqPBzQbaqHwDOk68zk6gqlxIko9pipyLW1vJIDeKJMvxOEXVsBY5eUO/nEJCe8f1LE/+RmiWM42Pji83DV0PRXE6uE4GQzUnkS0/niQPiwi1phiKVG8i+hqiLdiD+k7ZP8pADnV2j4aw/wMyLj7v0CasW+/WT+sVtlzpERQ= 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 1597082334144135.25756500215482; Mon, 10 Aug 2020 10:58:54 -0700 (PDT) Received: from localhost ([::1]:42364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5C4S-0001t5-TQ for importer@patchew.org; Mon, 10 Aug 2020 13:58:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BKx-0001qy-H3 for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:38023 helo=us-smtp-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 1k5BKv-0003Cn-Jc for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:11:51 -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-344-gXy_ZyEPM_-1sbhXdnG3rw-1; Mon, 10 Aug 2020 13:11:47 -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 91FE157 for ; Mon, 10 Aug 2020 17:11:46 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D71F55F1E9 for ; Mon, 10 Aug 2020 17:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=lMOKj2JUkDjiKQzhyDxdSKswLl4CNUMxR1j4M1JHaXA=; b=FHELghdKQbUPVhbrCNYaZiuhMXzBWFc4YG/CcEQDoUi0DJK5e3x/2msdfu8bn+vmGPQgO6 Amlv41HDDXrAfLy2yCbPzy4ypO7glkjqjvoVRbLIvpwxtOQzzo+JHWprPOWgCfbCn2eh3O qofAXPKDv0gNOb4fSt8JGpycp93SRA4= X-MC-Unique: gXy_ZyEPM_-1sbhXdnG3rw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 094/147] meson: convert hw/rtc Date: Mon, 10 Aug 2020 19:08:12 +0200 Message-Id: <1597079345-42801-95-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> 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 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00:11 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/rtc/Makefile.objs | 15 --------------- hw/rtc/meson.build | 16 ++++++++++++++++ 4 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 hw/rtc/Makefile.objs create mode 100644 hw/rtc/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 70ecaa8..f60fd01 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -24,7 +24,6 @@ devices-dirs-y +=3D nvram/ devices-dirs-y +=3D pci/ devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ devices-dirs-y +=3D pcmcia/ -devices-dirs-y +=3D rtc/ devices-dirs-$(CONFIG_SCSI) +=3D scsi/ devices-dirs-y +=3D sd/ devices-dirs-y +=3D ssi/ diff --git a/hw/meson.build b/hw/meson.build index 50b26db..1fb1687 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,6 +1,7 @@ subdir('core') subdir('mem') subdir('nubus') +subdir('rtc') subdir('semihosting') subdir('smbios') subdir('timer') diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs deleted file mode 100644 index e4c1b86..0000000 --- a/hw/rtc/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -common-obj-$(CONFIG_DS1338) +=3D ds1338.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_TWL92230) +=3D twl92230.o -common-obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp-rtc.o -common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_rtc.o -obj-$(CONFIG_MC146818RTC) +=3D mc146818rtc.o -common-obj-$(CONFIG_SUN4V_RTC) +=3D sun4v-rtc.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_rtc.o -common-obj-$(CONFIG_GOLDFISH_RTC) +=3D goldfish_rtc.o -common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-rtc.o diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build new file mode 100644 index 0000000..7cecdee --- /dev/null +++ b/hw/rtc/meson.build @@ -0,0 +1,16 @@ + +softmmu_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.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_PL031', if_true: files('pl031.c')) +softmmu_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c')) +softmmu_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('= m48t59-isa.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc= .c')) + +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c')) +softmmu_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_rtc.c')) +softmmu_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true: files('goldfish_rtc.c= ')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-rtc.= c')) + +specific_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'= )) --=20 1.8.3.1