From patchwork Mon Mar 4 18:19:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10838431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F5981803 for ; Mon, 4 Mar 2019 19:45:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87C452B2B1 for ; Mon, 4 Mar 2019 19:45:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7628A2B2BC; Mon, 4 Mar 2019 19:45:10 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E79A72B2B1 for ; Mon, 4 Mar 2019 19:45:09 +0000 (UTC) Received: from localhost ([127.0.0.1]:59854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tWP-0005VY-4Z for patchwork-qemu-devel@patchwork.kernel.org; Mon, 04 Mar 2019 14:45:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCw-0002Iv-55 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCr-0004dx-R3 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:55 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:38343) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCo-0004Wm-1t for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: by mail-wm1-x335.google.com with SMTP id a188so121729wmf.3 for ; Mon, 04 Mar 2019 10:20:49 -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=qS3FqLyEx5s7xVm8vTRZB2QxmgAylmTKIaoVPHGCiGk=; b=djq71oZLXpSnHKE15b2SQFOK9dwVidTNt+uF/5nym05NllUAe8zj968PSowIU6VXHm aDwyVCW/2Yvq1NxnPxwktxvm8nXQa4TbU/mgxsXoNoqPVGR3cS6wCJ1jIHqUAj9m0z2+ s92xQLM+Gkysi/SjxXX4UucwhRTtVoWZ0firwlG0uIQ9gGXy0kH2mjkt86B5LDYBm4uj CS8wxSCR3b0oHPewLmc8X7F71bXcwfzPsTbNHPdIplZTBl+Ba9qjagc8eTNMJF8y2g+I qbfUS6eVpZYsArb005klnpUwuoesA5RMVBWe4x0yJMdfB3Xr2qocxxKiH67Bb689t8FL 8wig== 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=qS3FqLyEx5s7xVm8vTRZB2QxmgAylmTKIaoVPHGCiGk=; b=TW5MYecsaz826Om9r5vNeLL6+gpGPscRHy2IzoxgNw+iEAqe8EaP04U7HC8M0R4NN1 BNcdAUv1a2UgzBaQ6XuaSwGrr750uzCxlQ0E6dFHmwk7i2SYIi9a330PO3usc7AKOLNa gqvvblbwb+tuLvJPDmQGZtyFqanZKbUB16mZK7qFNcomqZibhMooSWNVsFT2imxmcwUb VfsK+ACYP4pdOsFZocv4Z0Sj6cBxTUIdgeQi5LdWToYCX/P9XOjsLd2sla398YfHv+DN qKQ6VJl/gkH7wY8Td+SRxVvbY4Nnb8U+LBy1uDupUvGCED4pOBbekV+GshNeB3wwWqk9 FWhQ== X-Gm-Message-State: APjAAAXjHH9TKHjIbkvwdb6nOcBwk8dH00Amn4xen2yMahMXBKQcFlOb 9XxdVNanQ76tohUsRMR65oSF6xHM X-Google-Smtp-Source: APXvYqx1QGKts9eoRUqeWOLK9iMufMCMvVcW8KfU39chpmA+eGc5X6cN2ULOpegWc1iekGTsEBxrBw== X-Received: by 2002:a1c:a74a:: with SMTP id q71mr21887wme.45.1551723648184; Mon, 04 Mar 2019 10:20:48 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:53 +0100 Message-Id: <1551723614-1823-34-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> 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::335 Subject: [Qemu-devel] [PULL 33/54] ppc: Express dependencies of the 'prep' and '40p' 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: Yang Zhong , thuth@redhat.com, =?utf-8?q?Herv?= =?utf-8?q?=C3=83=C2=A9_Poussineau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thomas Huth Select the required devices in hw/ppc/Kconfig instead, so that ppc-softmmu.mak only contains the user-selectable PREP switch. Plug-in devices like NE2000_ISA are pulled in automatically by the Kconfig build system now. Cc: Hervé Poussineau Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 8 -------- hw/ppc/Kconfig | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 9ad307a..066cec9 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -55,11 +55,3 @@ CONFIG_MAC_NEWWORLD=y # For PReP CONFIG_PREP=y -CONFIG_PREP_PCI=y -CONFIG_RS6000_MC=y -CONFIG_I82374=y -CONFIG_I82378=y -CONFIG_PCKBD=y -CONFIG_NE2000_ISA=y -CONFIG_PC87312=y -CONFIG_CS4231A=y diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 30e3e81..24e4ed9 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -39,6 +39,16 @@ config SAM460EX config PREP bool + imply PCI_DEVICES + imply TEST_DEVICES + select CS4231A + select PREP_PCI + select I82374 + select I82378 + select LSI_SCSI_PCI + select M48T59 + select PC87312 + select RS6000_MC config RS6000_MC bool