From patchwork Thu Feb 7 17:57:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1038240 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="SjfwFwtq"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43wRVP0JBZz9s3q for ; Fri, 8 Feb 2019 05:22:05 +1100 (AEDT) Received: from localhost ([127.0.0.1]:44784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groJG-0003qi-TP for incoming@patchwork.ozlabs.org; Thu, 07 Feb 2019 13:22:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwG-0002Kr-TV for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwD-0002SF-52 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:14 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:40346) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwC-0002RA-JY for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:13 -0500 Received: by mail-wm1-x344.google.com with SMTP id q21so800837wmc.5 for ; Thu, 07 Feb 2019 09:58:10 -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=Sn8p67rWq4HN5rXve4l1DMvddArRQ0/XjKWU868LkLA=; b=SjfwFwtqrxJNEI3BoqFxfv/M1iGEgTzPO2N68sMjn35sorbF5CPY5oUaFuRCCvX2CN OLh/BDSS0KC48PzCI1oPVKNnq3Eni7vvM7m7gY8VIz+6a3GxJz79EY+Hi/SLcwscR2Za DaDlgQFab7ctN+qVVOvzpA4O2w+n3++cJJH0cldCWufm3i6JiHmhGDcAPVqjHGJaOuX7 vJD7gA6nbvI682rWud+BwSscf2Nzt+1ZxE2t3Iohm8P+MoY3qBtYGKvLnSE3tSHLzpr+ vzgq/G8AMExnjN7r6NVYmD7amMoY0dKkhqcz8mO/FKNqUSuHNi8z36VXyWBcXAN3s+R7 50gQ== 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=Sn8p67rWq4HN5rXve4l1DMvddArRQ0/XjKWU868LkLA=; b=XR/K+r1jv8ye8ICMwmCb/heFFQpQ8Jlu08pKy6CkyQHzAv4klvqN5MMx8hpKF3L8h4 JoO8NuWvRNyRDP5jcmMM/rHR6I1L09y3AS+er5IsQYvqZceSMbqNQE8ygwHo5J3qCTIu +4I4gnPAEXFLTXi1SQQbqhNXEAraGi25Dk0K6iLr4kA49zwMZ/RYNmDDxrFrrjxLFLgr 6iVZegnHWAGip6p1qcSEceqYKYCOsdK9pWWE65rx86izp9o/e2pKJU47d6t8h7uoRoZY Vx6iBgVsPOlLsAk0Z4IHSjfMW6LNh5kS3fH+tnhEYjvCVH3IShSALdyzZKW6crqNG+dA kZmw== X-Gm-Message-State: AHQUAuar5rHFEkxvbA5QS5uC8rc44r/8/94jmEWDIenqU8vSDR52i3Vn KpFPzIXIs9hDKziVXFATXrMSWfy0 X-Google-Smtp-Source: AHgI3IYr3BNLreSyr6tsgqvY3ce7qK52GrjUcGpIZCX9uh7/d9N2Ut3iz1FJJURGzDFmI/oLi/IVwg== X-Received: by 2002:a1c:7c07:: with SMTP id x7mr8425539wmc.82.1549562289689; Thu, 07 Feb 2019 09:58:09 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:15 +0100 Message-Id: <1549562254-41157-33-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-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::344 Subject: [Qemu-devel] [PATCH 32/51] ppc: Express dependencies of the Mac machines 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: Mark Cave-Ayland , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth This will make it for example easier if the users want to disable one of the two machines for their builds. Cc: Mark Cave-Ayland Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 15 --------------- hw/misc/Kconfig | 6 ++++++ hw/net/Kconfig | 1 + hw/pci-host/Kconfig | 4 +++- hw/ppc/Kconfig | 15 +++++++++++++++ 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 066cec9..caaff60 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -35,21 +35,6 @@ CONFIG_VGA_CIRRUS=y CONFIG_SMBUS_EEPROM=y # For Macs -CONFIG_ESCC=y -CONFIG_MACIO=y -CONFIG_MACIO_GPIO=y -CONFIG_SUNGEM=y -CONFIG_MOS6522=y -CONFIG_CUDA=y -CONFIG_ADB=y -CONFIG_MAC_NVRAM=y -CONFIG_MAC_DBDMA=y -CONFIG_MAC_PMU=y -CONFIG_HEATHROW_PIC=y -CONFIG_GRACKLE_PCI=y -CONFIG_UNIN_PCI=y -CONFIG_DEC_PCI=y -CONFIG_IDE_MACIO=y CONFIG_MAC_OLDWORLD=y CONFIG_MAC_NEWWORLD=y diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 74031cc..728c561 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -57,6 +57,12 @@ config MOS6522 config MACIO bool + select CUDA + select ESCC + select IDE_MACIO + select MAC_DBDMA + select MAC_NVRAM + select MOS6522 config IVSHMEM_DEVICE bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index dc69e55..1aa1071 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -86,6 +86,7 @@ config FTGMAC100 config SUNGEM bool + depends on PCI config COLDFIRE bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index ff4080c..b39ea29 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -10,8 +10,10 @@ config GRACKLE_PCI bool config UNIN_PCI - select PCI bool + select PCI + select DEC_PCI + select OPENPIC config PPCE500_PCI select PCI diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 9cebf0f..fb77151 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -55,9 +55,24 @@ config RS6000_MC config MAC_OLDWORLD bool + imply PCI_DEVICES + imply SUNGEM + imply TEST_DEVICES + select ADB + select GRACKLE_PCI + select HEATHROW_PIC + select MACIO config MAC_NEWWORLD bool + imply PCI_DEVICES + imply SUNGEM + imply TEST_DEVICES + select ADB + select MACIO + select MACIO_GPIO + select MAC_PMU + select UNIN_PCI config E500 bool