diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index fd91efb3e34110923481c9633a945ee1e6d01931..1ae077ed877e64057b676afbbb20fe0c187f8f1c 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 fd91efb3e34110923481c9633a945ee1e6d01931..235c6f473f7cf3b9c4b349fceed3ea6f882bd6e8 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 498958930897a932762d3e946cbf771d71aedb96..e0ee3043a61132cbf06703eb97a855bbeaa34eb6 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