From nobody Tue Feb 10 01:33:06 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=1597684070; cv=none; d=zohomail.com; s=zohoarc; b=VdAsFRaSB85KoSs+q7unoRY5QwafvuTHsqkgWANt4A7aa0udT3A4DpjWR+flMFe6mQs2GcOgVgYSrKG0U2Q6WubX6Fi+l3n+LJ9T8u3pVG588hk/cmjrVggSDFkpYLR66mR7x3eAft9M+SoaVL/tkW4ogCws1wbxVLFmG8A1cWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684070; 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=ODJdNdWjjNTd8b4kfugM0UtLCKBeocnqITNVNdo3kn8=; b=DnmzthJlILVFHBvc6bdJD64Mz0MqCeE3MF7B600DT6H1MIuKp7wUEElUmZ0kDD0G1A4stJnLEQEE8oKYL9VllCpMzWLEqAshIcsMDwq9WiGKv4+RW67xmqnWvs8dZQO8dIedt7sC2GC0ZZiLERwKvVTKtkwXbV1qz+5Z3KPJ7HI= 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 1597684070251500.8296103332667; Mon, 17 Aug 2020 10:07:50 -0700 (PDT) Received: from localhost ([::1]:43832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h5g-00089N-S9 for importer@patchew.org; Mon, 17 Aug 2020 11:30:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gKZ-0002wl-ED for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40292 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 1k7gKW-0006r3-Ak for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:41:47 -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-470-ys893nGPNASsxHaheRS7Jg-1; Mon, 17 Aug 2020 10:41:40 -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 10CCB185E521 for ; Mon, 17 Aug 2020 14:41:40 +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 574A2756AC; Mon, 17 Aug 2020 14:41:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675303; 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=ODJdNdWjjNTd8b4kfugM0UtLCKBeocnqITNVNdo3kn8=; b=WjG/5fPYpT5IbRLQBTIxsfMGEymfDXksZK6MXqzpxpmpU2gMP/9PIUkal0l83niAXzsSv/ 92dh711hzCNfGnVmxh8LIVEuQFOPFhmNJi69E6l+J3BbEm71qJOsyT8YKXfIVB2h4pfMOF t0b20/fv7nTrZUQjg7bN67Pigm9E6TI= X-MC-Unique: ys893nGPNASsxHaheRS7Jg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 116/150] meson: convert hw/gpio Date: Mon, 17 Aug 2020 16:40:19 +0200 Message-Id: <20200817144053.345107-21-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.001 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=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/17 05:13:21 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/gpio/Makefile.objs | 12 ------------ hw/gpio/meson.build | 12 ++++++++++++ hw/meson.build | 1 + 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 hw/gpio/Makefile.objs create mode 100644 hw/gpio/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index a2c2f6d1de..c04dfe589c 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -8,7 +8,6 @@ devices-dirs-y +=3D char/ devices-dirs-y +=3D cpu/ devices-dirs-y +=3D display/ devices-dirs-y +=3D dma/ -devices-dirs-y +=3D gpio/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs deleted file mode 100644 index 3cfc261f9b..0000000000 --- a/hw/gpio/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -common-obj-$(CONFIG_MAX7310) +=3D max7310.o -common-obj-$(CONFIG_PL061) +=3D pl061.o -common-obj-$(CONFIG_PUV3) +=3D puv3_gpio.o -common-obj-$(CONFIG_ZAURUS) +=3D zaurus.o -common-obj-$(CONFIG_E500) +=3D mpc8xxx.o -common-obj-$(CONFIG_GPIO_KEY) +=3D gpio_key.o - -common-obj-$(CONFIG_OMAP) +=3D omap_gpio.o -common-obj-$(CONFIG_IMX) +=3D imx_gpio.o -common-obj-$(CONFIG_RASPI) +=3D bcm2835_gpio.o -common-obj-$(CONFIG_NRF51_SOC) +=3D nrf51_gpio.o -common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_gpio.o diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build new file mode 100644 index 0000000000..6bcdfa6b1d --- /dev/null +++ b/hw/gpio/meson.build @@ -0,0 +1,12 @@ +softmmu_ss.add(when: 'CONFIG_E500', if_true: files('mpc8xxx.c')) +softmmu_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c')) +softmmu_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c')) +softmmu_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c')) +softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_gpio.c')) +softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c')) + +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c')) +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c')) diff --git a/hw/meson.build b/hw/meson.build index f9e5adfb48..52577c3205 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('gpio') subdir('hyperv') subdir('i2c') subdir('ide') --=20 2.26.2