From nobody Mon Feb 9 20:59:59 2026 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=1597682913; cv=none; d=zohomail.com; s=zohoarc; b=lqRTGF5OmG1KGiUsC+iuybj2aqhSDTn40lQ1koDyvyvtyK4b+SvuatbfOW/pwpXIAG0Doqvew8iS/klsUQxv57FivxibL67PY43qW1AdhAC+o5jyuXPL4CszCjAhyD9K6McGrhS1fj6OSy3gta6oic/CzvGb4PBmDIiasyHTkfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682913; 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=lsKD/IZ/ybi+/QCUoBcf65hoizOPZc27Qg+cQlKIV4c=; b=AJT2MXY+LxXSQNyz6y0rVc/Ho4sk2eKeU9ajicixi9Mmhp2P4fasNvmQWviJYVpzMyCe08nX9f0BezkGLnMwIPf0x/z5KzRrxTjynqGSdcYdb6JqyoGFnamxEttFTbkYuETPYN0bv672oUmdfq62HEbeUf2c3oZIXjS1GpkqsGc= 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 1597682913415825.6130807030752; Mon, 17 Aug 2020 09:48:33 -0700 (PDT) Received: from localhost ([::1]:56764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h2N-0001mt-0F for importer@patchew.org; Mon, 17 Aug 2020 11:27:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gK3-0002Cr-LE for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45149) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gK1-0006oc-Lv for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:15 -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-366-D1_y8iPwMtqKvpLA7bx-Ag-1; Mon, 17 Aug 2020 10:41:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B869F801ADB for ; Mon, 17 Aug 2020 14:41:09 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF80470C3D; Mon, 17 Aug 2020 14:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675272; 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=lsKD/IZ/ybi+/QCUoBcf65hoizOPZc27Qg+cQlKIV4c=; b=XuhCq1pPngHLAh+DnHD97/9RhhoYlJSqwCOe0GHt3DVZ3/Gdv6lZ6FdCp936In0rDwPUon FxIHpZ10qAxJRhAN3j3s8kKBve1V227OTs+BXAnCjov9JfDNgtj3ndMm98Bg4Q180q1Fn9 oOhbXMDxMlgbC2jFVguzocomq/l9dco= X-MC-Unique: D1_y8iPwMtqKvpLA7bx-Ag-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 104/150] meson: convert hw/nvram Date: Mon, 17 Aug 2020 16:40:07 +0200 Message-Id: <20200817144053.345107-9-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/17 01:24:49 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, 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/meson.build | 1 + hw/nvram/Makefile.objs | 8 -------- hw/nvram/meson.build | 9 +++++++++ 4 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 hw/nvram/Makefile.objs create mode 100644 hw/nvram/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 20832841d2..78860ae9c7 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -20,7 +20,6 @@ devices-dirs-y +=3D isa/ devices-dirs-y +=3D misc/ devices-dirs-y +=3D net/ devices-dirs-y +=3D rdma/ -devices-dirs-y +=3D nvram/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 53c347c395..0bdd6a2613 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,6 +1,7 @@ subdir('core') subdir('mem') subdir('nubus') +subdir('nvram') subdir('pci') subdir('pci-bridge') subdir('pci-host') diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs deleted file mode 100644 index f3ad921382..0000000000 --- a/hw/nvram/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -common-obj-$(CONFIG_DS1225Y) +=3D ds1225y.o -common-obj-$(CONFIG_NMC93XX_EEPROM) +=3D eeprom93xx.o -common-obj-$(CONFIG_AT24C) +=3D eeprom_at24c.o -common-obj-y +=3D fw_cfg.o -common-obj-$(CONFIG_CHRP_NVRAM) +=3D chrp_nvram.o -common-obj-$(CONFIG_MAC_NVRAM) +=3D mac_nvram.o -common-obj-$(CONFIG_NRF51_SOC) +=3D nrf51_nvm.o -obj-$(CONFIG_PSERIES) +=3D spapr_nvram.o diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build new file mode 100644 index 0000000000..ba214558ac --- /dev/null +++ b/hw/nvram/meson.build @@ -0,0 +1,9 @@ +softmmu_ss.add(files('fw_cfg.c')) +softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c')) +softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c')) +softmmu_ss.add(when: 'CONFIG_NMC93XX_EEPROM', if_true: files('eeprom93xx.c= ')) +softmmu_ss.add(when: 'CONFIG_AT24C', if_true: files('eeprom_at24c.c')) +softmmu_ss.add(when: 'CONFIG_MAC_NVRAM', if_true: files('mac_nvram.c')) +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_nvm.c')) + +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_nvram.c')) --=20 2.26.2