From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 4 Mar 2019 19:20:08 +0100 Message-Id: <1551723614-1823-49-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 48/54] sh4-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. 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 -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_SERIAL=y -CONFIG_PFLASH_CFI02=y -CONFIG_SH4=y -CONFIG_IDE_MMIO=y -CONFIG_SM501=y -CONFIG_TEST_DEVICES=y -CONFIG_I82378=y -CONFIG_I82374=y +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=n +#CONFIG_TEST_DEVICES=n + +# Boards: +# CONFIG_R2D=y CONFIG_SHIX=y -CONFIG_TEST_DEVICES=y diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.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 -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_SERIAL=y -CONFIG_PFLASH_CFI02=y -CONFIG_SH4=y -CONFIG_IDE_MMIO=y -CONFIG_SM501=y -CONFIG_TEST_DEVICES=y -CONFIG_I82378=y -CONFIG_I82374=y -CONFIG_R2D=y -CONFIG_SHIX=y +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 config SHIX bool + select SH7750 + select SH4 config SH7750 bool -- 1.8.3.1