diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-01-29 12:16:27 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-07 21:46:19 +0100 |
| commit | 82a230d5a3031d19ca522f52251046ba30242828 (patch) | |
| tree | b53ba1e8d1d39b3822f1450534e9194305a9300d | |
| parent | 312c320ff8654e24a13443a60db6ce6a08fb74f6 (diff) | |
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 <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/riscv32-softmmu.mak | 21 | ||||
| -rw-r--r-- | default-configs/riscv64-softmmu.mak | 22 | ||||
| -rw-r--r-- | hw/riscv/Kconfig | 13 |
3 files changed, 21 insertions, 35 deletions
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 diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 4989589308..e0ee3043a6 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -9,12 +9,25 @@ config SIFIVE config SIFIVE_E bool + select HART + select SIFIVE config SIFIVE_U bool + select CADENCE + select HART + select SIFIVE config SPIKE bool + select HART + select HTIF + select SIFIVE config RISCV_VIRT bool + select HART + select SERIAL + select VIRTIO_MMIO + select PCI_EXPRESS_GENERIC_BRIDGE + select SIFIVE |