From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:46380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD7-0002UA-FG for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD5-00059M-Oo for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD3-0004z5-V2 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:06 -0500 Received: by mail-wr1-x444.google.com with SMTP id w17so6627528wrn.12 for ; Mon, 04 Mar 2019 10:21:03 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 4 Mar 2019 19:20:09 +0100 Message-Id: <1551723614-1823-50-git-send-email-pbonzini@redhat.com> In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 49/54] sparc-softmmu.mak: express dependencies with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: thuth@redhat.com, Yang Zhong %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/sparc-softmmu.mak | 22 ++++++---------------- hw/misc/Kconfig | 1 + hw/net/Kconfig | 1 + hw/sparc/Kconfig | 13 +++++++++++++ 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index b31a9f2..ee85218 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -1,21 +1,11 @@ # Default configuration for sparc-softmmu -CONFIG_ISA_BUS=y -CONFIG_ECC=y -CONFIG_ESP=y -CONFIG_ESCC=y -CONFIG_M48T59=y -CONFIG_FDC=y -CONFIG_EMPTY_SLOT=y -CONFIG_PCNET_COMMON=y -CONFIG_LANCE=y -CONFIG_TCX=y -CONFIG_CG3=y -CONFIG_SLAVIO=y -CONFIG_CS4231=y -CONFIG_GRLIB=y -CONFIG_STP2000=y -CONFIG_ECCMEMCTL=y +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_TCX=n +#CONFIG_CG3=n +# Boards: +# CONFIG_SUN4M=y CONFIG_LEON3=y diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index a012d2c..2c60be9 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -71,6 +71,7 @@ config IVSHMEM_DEVICE config ECCMEMCTL bool + select ECC config IMX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 6b4633b..c00ec03 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -77,6 +77,7 @@ config STELLARIS_ENET config LANCE bool + select PCNET_COMMON config SUNHME bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index c9c2142..2a83a80 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -1,8 +1,21 @@ config SUN4M bool + imply TCX + imply CG3 + select CS4231 + select ECCMEMCTL + select EMPTY_SLOT + select ESCC + select ESP + select FDC + select SLAVIO + select LANCE + select M48T59 + select STP2000 config LEON3 bool + select GRLIB config GRLIB bool -- 1.8.3.1