From patchwork Tue Jan 16 11:51:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 10166585 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0F6B3600CA for ; Tue, 16 Jan 2018 11:54:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 021762847E for ; Tue, 16 Jan 2018 11:54:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA75C28497; Tue, 16 Jan 2018 11:54:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, FSL_HELO_FAKE, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4ACF32847E for ; Tue, 16 Jan 2018 11:54:12 +0000 (UTC) Received: from localhost ([::1]:58984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebPoh-00082D-Df for patchwork-qemu-devel@patchwork.kernel.org; Tue, 16 Jan 2018 06:54:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebPlt-0005c4-De for qemu-devel@nongnu.org; Tue, 16 Jan 2018 06:51:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebPls-0000Bt-7w for qemu-devel@nongnu.org; Tue, 16 Jan 2018 06:51:17 -0500 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:43146) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebPls-0000Ag-19 for qemu-devel@nongnu.org; Tue, 16 Jan 2018 06:51:16 -0500 Received: by mail-lf0-x242.google.com with SMTP id o89so12944323lfg.10 for ; Tue, 16 Jan 2018 03:51:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eZebWVvhO0AuSqTcou3N533YGXzk4LIyAviKu+tvsbA=; b=TpNiIOKbQKvdf841vIWpN3arIRsHigMcKSI6ZgGvv/rX9laBGSO97V/AjWom/Z7pfr WNfIpNM4gfPUcCV+PBWLwkzIy7e57Ii+i5SvsWAsoQRbN2EXEj6hKJZgLm8QSFZLovM1 c8qk5aYBUkaw1qiodSf9EaDoSYWwNIm0KxMwJJvlrLgWpFmkEiOO26fljSaLhYQZwc2F dmyKh/rWQcdaRC48ZSAqC5Id+zImctWNzaW2iRJMPCmAszW44M/yIDfq/Ni1KBmc6QdO vwThM359HhpAJ3UVsFtDx0VGY+n0y1FG8L6aibLMrETyhCPtHW0M+0scZLN175IvuruI 3SdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eZebWVvhO0AuSqTcou3N533YGXzk4LIyAviKu+tvsbA=; b=nQ7Cb3YqQZgAjMttWhYKFmRlvCWIBFk8c9tP8kVX/W11KQzRB+fStUb4hHigiYki4Q E1U5oXsP6vA/lAv1ziPdaQbIDx3Ylj0TA7jckR13XksJJ2Y86YTYV47amxzS/KjXfOrC ilGTENjeUDzQ6gopYxlkFhOeX6nHQ2lwUGl9Y70AyaZHUhle7jCH8l4RG4yDqsEaguDh gwtcmj6kyR90c2SFU5EBr2QBeFMLvYzZWd2qH2pZgykUaEoJQ01eF5DnrzUti0Qq4rnz AEqUrd6F/4pRXAAi88fBzGYIiTMZBgvVD/Lb7ItbuHCRR8lCz2uC0IS588GdkUNdOT83 KTCg== X-Gm-Message-State: AKwxytdfXPdkCKDAPSbiL8dKKzgVlPJ6THgCzqJh7zNklpTTxyGiPKNA TXAUnSIbkfmdFS/QYQc/QZMLyg== X-Google-Smtp-Source: ACJfBosOKHjhfk/3ViBlMqfn09lMFSTN0qxQWynvli8aumY+/wtfRBJmL47v78RqFb47iSgvDHlZSw== X-Received: by 10.46.80.12 with SMTP id e12mr2218347ljb.47.1516103474467; Tue, 16 Jan 2018 03:51:14 -0800 (PST) Received: from gmail.com (81-231-232-130-no39.tbcn.telia.com. [81.231.232.130]) by smtp.gmail.com with ESMTPSA id w13sm384748ljw.69.2018.01.16.03.51.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 03:51:13 -0800 (PST) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 16 Jan 2018 12:51:02 +0100 Message-Id: <1516103467-7983-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516103467-7983-1-git-send-email-edgar.iglesias@gmail.com> References: <1516103467-7983-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::242 Subject: [Qemu-devel] [PULL v1 3/8] aarch64-softmmu.mak: Use an ARM specific config X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sai.pavan.boddu@xilinx.com, edgar.iglesias@xilinx.com, alistai@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Alistair Francis In preperation for having an ARM and MicroBlaze ZynqMP machine let's split out the current ARM specific config options. Signed-off-by: Alistair Francis Acked-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Signed-off-by: Edgar E. Iglesias --- default-configs/aarch64-softmmu.mak | 1 + hw/arm/Makefile.objs | 2 +- hw/display/Makefile.objs | 2 +- hw/dma/Makefile.objs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak index 2449483..9ddccf8 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_AUX=y CONFIG_DDC=y CONFIG_DPCD=y CONFIG_XLNX_ZYNQMP=y +CONFIG_XLNX_ZYNQMP_ARM=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 2794e08..1c896ba 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -13,7 +13,7 @@ obj-y += omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-zcu102.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zynqmp.o xlnx-zcu102.o obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 551c050..d3a4cb3 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -40,4 +40,4 @@ virtio-gpu.o-libs += $(VIRGL_LIBS) virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS) virtio-gpu-3d.o-libs += $(VIRGL_LIBS) obj-$(CONFIG_DPCD) += dpcd.o -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dp.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs index 0b3a009..5adf385 100644 --- a/hw/dma/Makefile.objs +++ b/hw/dma/Makefile.objs @@ -8,7 +8,7 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o common-obj-$(CONFIG_STP2000) += sparc32_dma.o -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o