OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Paolo Bonzini 2019-01-29 12:16:27 +01:00
parent 312c320ff8
commit 82a230d5a3
3 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
default-configs/riscv32-softmmu.mak
View File

@ -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

22
default-configs/riscv64-softmmu.mak
View File

@ -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

13
hw/riscv/Kconfig
View File

@ -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