From nobody Sun Oct 5 01:45:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551729340851921.8950507226355; Mon, 4 Mar 2019 11:55:40 -0800 (PST) Received: from localhost ([127.0.0.1]:60023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tgT-0006T7-Qp for importer@patchew.org; Mon, 04 Mar 2019 14:55:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sDC-0002Xt-TN for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD4-00057T-KD for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:14 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42397) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD3-0004sm-LT for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:05 -0500 Received: by mail-wr1-x42e.google.com with SMTP id r5so6632384wrg.9 for ; Mon, 04 Mar 2019 10:21:00 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:59 -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; bh=QgqBdMuhJzYZYJTvGb920gQmStPDhqh9vYdN2guZ+I4=; b=FE7apUoMyQlK88RBHV34RbsykLzgwvQj7gjILDMFr+JP81w+7JKjPP4lIe3idTt12R cUu729wH2HN7GcjV+VhIOnSud/gQO7WRHEO/dY16kiyRgsU0qPjkJDJOXS4heKonhpbO 9BMLIkojpzEIr6koEJn+u6XEdxD/FB+XcgLxzYCadOOCNsAKZ3FwxmGUcmuUUy5y10+l TzavKjrD+how9saHypOOFxm+XUwb4qVzUQHTGL04GxZVPp75YM4C8nwMlvDSi0ABfsCG 9wqY/tH9PoDoeePw8tWFj6b/nRApL8J4jhoY1GgAqA/nfWuUtwFOVl6ZNXNXGi9gIffr ciUA== 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; bh=QgqBdMuhJzYZYJTvGb920gQmStPDhqh9vYdN2guZ+I4=; b=jLKgcYtCHvdO+SJ9mGe+IAzDUXr1rC9j1Z1E97waICyGB2akmjLofOb7wdAFejp0On Z8yoDN3dxvkkP6oc88osb97dPn0G0D0CiHyus0FO/y5uDpmwLpfAPsxxGuv0gefi41T5 EqqmHnVz9G4Nh4XL0mlh+IT2UxiWZBXg3YEkdK2dBW3z9DIV6o/a8lgJ8/taVj9izjBa B2/F+lXGJFZW/I3kkixEcZPERSczo5r4SKs1fHmGqlqOH5E0PXcuT8Y1veook7PI33BG lUNG7iR+6MbiE/Shv3YuMOZx1DHjud1qP7e1E2UzLJEOBNXOHBWDpOKqL+Nq5cewS2pe 9fTw== X-Gm-Message-State: APjAAAUaHcuMwlG4aguxz1kTTfcmLuE91yD3D6myIXWadrNMqC6u/kO6 6cAb5O+krUpeGIo+UnNDb8AmOVJr X-Google-Smtp-Source: APXvYqyC19dTUhQdXBu/KwZrAy2F3hs3rw66wP1VAHjnKzNC+fOvPLR0EvH+Mxfj9Ni306/dAUqU9g== X-Received: by 2002:a5d:4e52:: with SMTP id r18mr12899159wrt.7.1551723659759; Mon, 04 Mar 2019 10:20:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:06 +0100 Message-Id: <1551723614-1823-47-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PULL 46/54] riscv-softmmu.mak: replace CONFIG_* with Kconfig "select" directives 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: Yang Zhong , thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/riscv32-softmmu.mak | 21 ++++++--------------- default-configs/riscv64-softmmu.mak | 22 ++-------------------- hw/riscv/Kconfig | 13 +++++++++++++ 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index fd91efb..1ae077e 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,21 +1,12 @@ -# Default configuration for riscv-softmmu +# Default configuration for riscv32-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_VIRTIO_MMIO=3Dy - -CONFIG_CADENCE=3Dy - -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy - -CONFIG_VGA=3Dy -CONFIG_VGA_PCI=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn =20 +# Boards: +# CONFIG_SPIKE=3Dy -CONFIG_HART=3Dy CONFIG_SIFIVE_E=3Dy -CONFIG_SIFIVE=3Dy CONFIG_SIFIVE_U=3Dy CONFIG_RISCV_VIRT=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index fd91efb..235c6f4 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,21 +1,3 @@ -# Default configuration for riscv-softmmu +# Default configuration for riscv64-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_VIRTIO_MMIO=3Dy - -CONFIG_CADENCE=3Dy - -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy - -CONFIG_VGA=3Dy -CONFIG_VGA_PCI=3Dy - -CONFIG_SPIKE=3Dy -CONFIG_HART=3Dy -CONFIG_SIFIVE_E=3Dy -CONFIG_SIFIVE=3Dy -CONFIG_SIFIVE_U=3Dy -CONFIG_RISCV_VIRT=3Dy +include riscv32-softmmu.mak diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 4989589..e0ee304 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -9,12 +9,25 @@ config SIFIVE =20 config SIFIVE_E bool + select HART + select SIFIVE =20 config SIFIVE_U bool + select CADENCE + select HART + select SIFIVE =20 config SPIKE bool + select HART + select HTIF + select SIFIVE =20 config RISCV_VIRT bool + select HART + select SERIAL + select VIRTIO_MMIO + select PCI_EXPRESS_GENERIC_BRIDGE + select SIFIVE --=20 1.8.3.1