From nobody Sun Oct 5 01:44:59 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 1551728988562912.6300266594649; Mon, 4 Mar 2019 11:49:48 -0800 (PST) Received: from localhost ([127.0.0.1]:59932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tar-0001SM-EY for importer@patchew.org; Mon, 04 Mar 2019 14:49:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD6-0002Sg-1h for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD4-00057Z-LR for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:07 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:53714) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD3-0004xg-QE for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:06 -0500 Received: by mail-wm1-x332.google.com with SMTP id e74so129320wmg.3 for ; Mon, 04 Mar 2019 10:21:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.21.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:21:00 -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=5gJM+Uoo0C9kJr/jT5zAR4CvLYEHTQs4ZFvYyqQRLaQ=; b=GwXaYH55HkofXqwZZBCPGH8nleaQmvNokT0s4XekOakSqp9fxFch+16huakc2WED+4 YjCl31tdh16QpPKs7Nrz5bgvP+LuRr/JL/IPQToTD5/km4N9AyfdexT+ZDbweZ+FsG+O PklJ9sgea9tNHbnIOChrQkjMKCk5V+tqWnalCICxHmbj6qoSLMnHcolCeXaFEBw5dhhu 8kv+M7HweTiw1N0lXzOvzjC6Rt1MgEyaZZtdDg7HhN96O+TcOZxisuprLVnebn3oF4a9 cfLGmb3izXA3ni9xJfUmUt+loPHIZbB1RoYl3cXR5jBjwaLpxG/JJ6lMVtX7wBquF8us nOdg== 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=5gJM+Uoo0C9kJr/jT5zAR4CvLYEHTQs4ZFvYyqQRLaQ=; b=RmXrFS4DXhsy6T5zNC/LjS2JcoFH3fFnmBnkjXie649+vWvRtsu2k2lCRs1PAnVJ/N RGpFqhq8LH0Vv2NZnjNvHgKZq96EiDLLA1FYfHdmryrKFqujx3hUYNxUmLsa00HNtU38 rEelkL7cGsLM91/gy6ZQgwHq2kVu+7ITc5FKyEZoxGd4ZxwKa4IAx6e1TmIlmtRXOI+u c5TLIGVLcVtb7CzdMTowqxjJafeVjzGLLapCN87BpvRbve97aLl/76ApxDO2rN1CZCcC e9SC6KZpNACl0Cd/MzNWrHYkatUqmlsRQ6zwVqpc2u6YprE8lQG7DEYE680Gi/Vte8yk HPnw== X-Gm-Message-State: APjAAAXEfin9Syi+sNG//bk9YZiW01S5vaoHEo1qZ4d8eO1rQLdEe7nG 7DrRTr1tVgMPIcPn5QszJm6uRcVW X-Google-Smtp-Source: APXvYqwG62exvq/xIF6s/h/BQG2eIMmiIN4oilTBaI3QBmwyjuvWi2CLvJuwhPATz/MjkkskG57xBg== X-Received: by 2002:a1c:80d6:: with SMTP id b205mr269507wmd.109.1551723661291; Mon, 04 Mar 2019 10:21:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:08 +0100 Message-Id: <1551723614-1823-49-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::332 Subject: [Qemu-devel] [PULL 48/54] sh4-softmmu.mak: express dependencies with Kconfig 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. Note that USB_OHCI was missing (it was brought in via pci.mak, but r2d needs the sysbus version) and SERIAL is not used. Signed-off-by: Paolo Bonzini --- default-configs/sh4-softmmu.mak | 18 +++++++----------- default-configs/sh4eb-softmmu.mak | 13 +------------ hw/sh4/Kconfig | 11 +++++++++++ 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 4ba5584..565e8b0 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,15 +1,11 @@ # Default configuration for sh4eb-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_SH4=3Dy -CONFIG_IDE_MMIO=3Dy -CONFIG_SM501=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_I82378=3Dy -CONFIG_I82374=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_TEST_DEVICES=3Dn + +# Boards: +# CONFIG_R2D=3Dy CONFIG_SHIX=3Dy -CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 9717673..522a7a5 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,14 +1,3 @@ # Default configuration for sh4eb-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_SH4=3Dy -CONFIG_IDE_MMIO=3Dy -CONFIG_SM501=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_I82378=3Dy -CONFIG_I82374=3Dy -CONFIG_R2D=3Dy -CONFIG_SHIX=3Dy +include sh4-softmmu.mak diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 1ea2bc3..8597613 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -1,8 +1,19 @@ config R2D bool + imply PCI_DEVICES + imply TEST_DEVICES + select I82378 if TEST_DEVICES + select IDE_MMIO + select PFLASH_CFI02 + select USB_OHCI + select PCI + select SM501 + select SH4 =20 config SHIX bool + select SH7750 + select SH4 =20 config SH7750 bool --=20 1.8.3.1