From patchwork Thu Dec 12 12:51:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11288279 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15E30930 for ; Thu, 12 Dec 2019 13:48:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E0BB62077B for ; Thu, 12 Dec 2019 13:48:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SNE2+tez" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E0BB62077B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:59538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOpM-0003lu-JW for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 Dec 2019 08:48:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40462) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyw-0004Pv-TK 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 1ifNyv-0007tg-J0 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:14 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:34228) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyv-0007s3-9e for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:13 -0500 Received: by mail-wr1-x435.google.com with SMTP id t2so2646587wrr.1 for ; Thu, 12 Dec 2019 04:54:13 -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=tSMwvOVlmljJ/d7pUHQjqPiE5EBDb5gSPZ7yrnNNJfk=; b=SNE2+tezie7kPxeQwQ1zKJ31REZIRUiH5F49tNoYAyrmeVoDq3nbxUaaz06z0nFi+z qr81l8U288WjjM9wnhoYADBu+9zY4WMMPtgIiGEerfoqzfWfej6Nj8TXnVhEEj+esGDc Hv4giCv5EKwFr7QsinMQv2/4A1tFmAo17DVXcimmnsPIzJgMOKZaHoyzO0vW4uvNREmv 3++QaqBtH5aWHUH2FVCy9ovDsP5xdo2ryQjxJSyZR7cQjzWHwEEXcgHQ4B9rDDmIKOtY I1gKqkXxNRbznj3E2/UUnlk5b43jURzrlA+N+IzwqSGNGsw5yyuZds4TsqG7O3Y0PC0Q Pj5g== 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=tSMwvOVlmljJ/d7pUHQjqPiE5EBDb5gSPZ7yrnNNJfk=; b=c8tyXWOutf2Uq0zt9fROB+T93LqDsUIM4TvonkKcXoQI1MxXLoH/ZZN6b8ZJv+AOie Bbit/aRm91+XPpWq52mXiIHyb2diF5k4xlLFgZzc4b1t1tsAnPLnNYaJGAlRw3SY1uP5 +bBboMYFl0QFZ+nVNZhHqb3dBEzqV3mUHj7/6f4V1SF+6bSbCNeg3Lflep8rEPVqV/Eg tpCPGN1ajCEb8wkXF83x/b9MIUiQK7N5SyHZJk8uBf0OAUJtP/TOD54HFVEDjxnse7Zs ZqWZ7bH/GB+GzrL46XRFf9J45J1MRR8SVIb7OWTy6VJxyUAG3/uFXgvQ/a7J299U6khV dQ2Q== X-Gm-Message-State: APjAAAUjJH9Bcw/IquIYFvHXDBvuO+Y51Fniz08dJ7NWmYPDCUiJSKc8 wZOeWM5orEA38pFfTyUOtaTnhBSI X-Google-Smtp-Source: APXvYqy5pey0D27+QQgofM/UsmmeEhimhJqgLZRBha717I8MkKwGaPoseAHiJ+a3u8OuhuivZjIMrQ== X-Received: by 2002:adf:ffc7:: with SMTP id x7mr6133054wrs.159.1576155252105; 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.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 074/132] meson: convert hw/ssi Date: Thu, 12 Dec 2019 13:51:58 +0100 Message-Id: <1576155176-2464-75-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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/ssi/Makefile.objs | 10 ---------- hw/ssi/meson.build | 10 ++++++++++ 4 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 hw/ssi/Makefile.objs create mode 100644 hw/ssi/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 1d47113..201d614 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -27,7 +27,6 @@ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ devices-dirs-y += pcmcia/ devices-dirs-$(CONFIG_SCSI) += scsi/ devices-dirs-y += sd/ -devices-dirs-y += ssi/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 960fd14..a867f82 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') subdir('semihosting') subdir('smbios') +subdir('ssi') subdir('timer') subdir('tpm') subdir('usb') diff --git a/hw/ssi/Makefile.objs b/hw/ssi/Makefile.objs deleted file mode 100644 index f5bcc65..0000000 --- a/hw/ssi/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -common-obj-$(CONFIG_PL022) += pl022.o -common-obj-$(CONFIG_SSI) += ssi.o -common-obj-$(CONFIG_XILINX_SPI) += xilinx_spi.o -common-obj-$(CONFIG_XILINX_SPIPS) += xilinx_spips.o -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_smc.o -common-obj-$(CONFIG_STM32F2XX_SPI) += stm32f2xx_spi.o -common-obj-$(CONFIG_MSF2) += mss-spi.o - -obj-$(CONFIG_OMAP) += omap_spi.o -obj-$(CONFIG_IMX) += imx_spi.o diff --git a/hw/ssi/meson.build b/hw/ssi/meson.build new file mode 100644 index 0000000..612c109 --- /dev/null +++ b/hw/ssi/meson.build @@ -0,0 +1,10 @@ +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_smc.c')) +softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-spi.c')) +softmmu_ss.add(when: 'CONFIG_PL022', if_true: files('pl022.c')) +softmmu_ss.add(when: 'CONFIG_SSI', if_true: files('ssi.c')) +softmmu_ss.add(when: 'CONFIG_STM32F2XX_SPI', if_true: files('stm32f2xx_spi.c')) +softmmu_ss.add(when: 'CONFIG_XILINX_SPI', if_true: files('xilinx_spi.c')) +softmmu_ss.add(when: 'CONFIG_XILINX_SPIPS', if_true: files('xilinx_spips.c')) + +specific_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c')) +specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c'))