From 82a230d5a3031d19ca522f52251046ba30242828 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 29 Jan 2019 12:16:27 +0100 Subject: riscv-softmmu.mak: replace CONFIG_* with Kconfig "select" directives %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/riscv32-softmmu.mak | 21 ++++++--------------- default-configs/riscv64-softmmu.mak | 22 ++-------------------- 2 files changed, 8 insertions(+), 35 deletions(-) (limited to 'default-configs') diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index fd91efb3e3..1ae077ed87 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,21 +1,12 @@ -# Default configuration for riscv-softmmu +# Default configuration for riscv32-softmmu -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_SERIAL=y -CONFIG_VIRTIO_MMIO=y - -CONFIG_CADENCE=y - -CONFIG_PCI_EXPRESS=y -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y - -CONFIG_VGA=y -CONFIG_VGA_PCI=y +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=n +# Boards: +# CONFIG_SPIKE=y -CONFIG_HART=y CONFIG_SIFIVE_E=y -CONFIG_SIFIVE=y CONFIG_SIFIVE_U=y CONFIG_RISCV_VIRT=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index fd91efb3e3..235c6f473f 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,21 +1,3 @@ -# Default configuration for riscv-softmmu +# Default configuration for riscv64-softmmu -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_SERIAL=y -CONFIG_VIRTIO_MMIO=y - -CONFIG_CADENCE=y - -CONFIG_PCI_EXPRESS=y -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y - -CONFIG_VGA=y -CONFIG_VGA_PCI=y - -CONFIG_SPIKE=y -CONFIG_HART=y -CONFIG_SIFIVE_E=y -CONFIG_SIFIVE=y -CONFIG_SIFIVE_U=y -CONFIG_RISCV_VIRT=y +include riscv32-softmmu.mak -- cgit v1.2.3-55-g7522