From patchwork Tue Feb 5 18:15:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1037108 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KBlGkmdM"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vDk50K9Mz9s7T for ; Wed, 6 Feb 2019 06:13:01 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr69S-0006sN-SY for incoming@patchwork.ozlabs.org; Tue, 05 Feb 2019 14:12:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5H4-00036L-IH for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5Gz-0004Ps-N8 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:45 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:40598) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr5Gq-0004Kk-AU for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:36 -0500 Received: by mail-wm1-x331.google.com with SMTP id f188so4727051wmf.5 for ; Tue, 05 Feb 2019 10:16:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ircRBc6k5hgSZm+31EX5eyGI7FFt/IS5w7tEfRPC8Eg=; b=KBlGkmdM4z6++bGawUaKx6RwSqsi04Cfy7lPSvcDM/q9nLeRjx7+SMhSw3Ih5DP3DA fa/sRQ5pn+dnxyCVK0FkVY9b0A4SRcQQ4t0cejKpnYRhlJ0SnXKwEftJAgiY9Mu/jz63 K71xmMmWJcCp6E2FBT+B486zwuSyGw0i7Vej88IfVfliL2qJzNWW1ZByf0IjRw6lbpbp jUFg/kgR6IEdD0YNZcxgbP2YIqlH0bhuIeO92ELBFaaVCZ/3CrLofzPNYy3MCmELLt08 MN9ZpgTnIR4NGFFuWpI+8jqpKMneHziEAxMHl0g7U0qLVqW8KIeI1ZfBRLmAL6vVdpVE x2gw== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ircRBc6k5hgSZm+31EX5eyGI7FFt/IS5w7tEfRPC8Eg=; b=LPreikgUdiCMGXwH4Q7tzpilV4BHrSXbcW9g3ixdED1POd9C+FeGLDA2aKShQFXuUO MeP4e7el5lOg8EDreFhu+JcikaUVRChxfypHHuLY8bTSOegE+hr8ZEdSUa8z0ba4hJsm /qsCeI3XzHBcwXMfnkiMRGlkklCYqtc9D9lhrNf3YeUZy93+IuPBAfr1MZCMelx2JHk0 i6YG+4Z7Zl6I2xJyXT8za5dWnqlPIyCbbnq1sUVhYdVTGW3j1wFT1FujVe3Soq1dfFdn IjxdQwIqcl5t4mDYJ6TMQyL8VHJ2oym43G+1t16U3TJzOn6k8ZECAc4dMmbLytsEGI7u w8ng== X-Gm-Message-State: AHQUAub3Lqm35LLJhmicVP9zNgmSyKWl1RbWtkg6mIg/Z72cp6C5o3j+ ZEJnyTQl6IYnH7OjkQndqHItB0xp X-Google-Smtp-Source: AHgI3Ib/DUq7vN///sWkKUnoCzKvYYQt3WJ1voDD8UoWmZ/CubOZHmT8mFTkewKtXuVIYIk3KNp/8w== X-Received: by 2002:a1c:5dd1:: with SMTP id r200mr4904447wmb.93.1549390590500; Tue, 05 Feb 2019 10:16:30 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p5sm8931665wmh.16.2019.02.05.10.16.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 10:16:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 19:15:10 +0100 Message-Id: <1549390526-24246-61-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> References: <1549390526-24246-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::331 Subject: [Qemu-devel] [PULL 60/76] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally 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: =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Ákos Kovács Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak. Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Acked-by: Max Filippov Message-Id: <20190202072456.6468-17-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/xtensa-softmmu.mak | 3 +++ default-configs/xtensaeb-softmmu.mak | 3 +++ hw/xtensa/Makefile.objs | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak index 9d8899c..baf90ca 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -3,3 +3,6 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y CONFIG_PFLASH_CFI01=y + +CONFIG_XTENSA_SIM=y +CONFIG_XTENSA_FPGA=y diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak index 9d8899c..baf90ca 100644 --- a/default-configs/xtensaeb-softmmu.mak +++ b/default-configs/xtensaeb-softmmu.mak @@ -3,3 +3,6 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y CONFIG_PFLASH_CFI01=y + +CONFIG_XTENSA_SIM=y +CONFIG_XTENSA_FPGA=y diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs index f30e4a7..fa86730 100644 --- a/hw/xtensa/Makefile.objs +++ b/hw/xtensa/Makefile.objs @@ -1,5 +1,5 @@ obj-y += mx_pic.o obj-y += pic_cpu.o -obj-y += sim.o obj-y += xtensa_memory.o -obj-y += xtfpga.o +obj-$(CONFIG_XTENSA_SIM) += sim.o +obj-$(CONFIG_XTENSA_FPGA) += xtfpga.o