ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

riscv: switch boards to "default y" 

Some targets use "default y" for boards to filter out those that require
TCG.  For consistency we are switching all other targets to do the same.
Continue with RISC-V.

No changes to generated config-devices.mak file.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-01-25 13:36:37 +01:00
parent bf616ce47b
commit a980c33dea
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.d/buildtest.yml
View File

@ -649,7 +649,7 @@ build-tci:
# Check our reduced build configurations # Check our reduced build configurations
# requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
# mips64el, or1k, ppc, ppc64, x86_64 # mips64el, or1k, ppc, ppc64, riscv32, riscv64, x86_64
# does not build without boards: i386, loongarch64, x86_64 # does not build without boards: i386, loongarch64, x86_64
build-without-defaults: build-without-defaults:
extends: .native_build_job_template extends: .native_build_job_template

13
configs/devices/riscv32-softmmu/default.mak
View File

@ -4,10 +4,9 @@
# CONFIG_PCI_DEVICES=n # CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n # CONFIG_TEST_DEVICES=n
# Boards: # Boards are selected by default, uncomment to keep out of the build.
# # CONFIG_SPIKE=n
CONFIG_SPIKE=y # CONFIG_SIFIVE_E=n
CONFIG_SIFIVE_E=y # CONFIG_SIFIVE_U=n
CONFIG_SIFIVE_U=y # CONFIG_RISCV_VIRT=n
CONFIG_RISCV_VIRT=y # CONFIG_OPENTITAN=n
CONFIG_OPENTITAN=y

15
configs/devices/riscv64-softmmu/default.mak
View File

@ -4,11 +4,10 @@
# CONFIG_PCI_DEVICES=n # CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n # CONFIG_TEST_DEVICES=n
# Boards: # Boards are selected by default, uncomment to keep out of the build.
# # CONFIG_SPIKE=n
CONFIG_SPIKE=y # CONFIG_SIFIVE_E=n
CONFIG_SIFIVE_E=y # CONFIG_SIFIVE_U=n
CONFIG_SIFIVE_U=y # CONFIG_RISCV_VIRT=n
CONFIG_RISCV_VIRT=y # CONFIG_MICROCHIP_PFSOC=n
CONFIG_MICROCHIP_PFSOC=y # CONFIG_SHAKTI_C=n
CONFIG_SHAKTI_C=y

14
hw/riscv/Kconfig
View File

@ -8,6 +8,8 @@ config IBEX
config MICROCHIP_PFSOC config MICROCHIP_PFSOC
bool bool
default y
depends on RISCV64
select CADENCE_SDHCI select CADENCE_SDHCI
select CPU_CLUSTER select CPU_CLUSTER
select MCHP_PFSOC_DMC select MCHP_PFSOC_DMC
@ -21,12 +23,16 @@ config MICROCHIP_PFSOC
config OPENTITAN config OPENTITAN
bool bool
default y
depends on RISCV32
select IBEX select IBEX
select SIFIVE_PLIC select SIFIVE_PLIC
select UNIMP select UNIMP
config RISCV_VIRT config RISCV_VIRT
bool bool
default y
depends on RISCV32 || RISCV64
imply PCI_DEVICES imply PCI_DEVICES
imply VIRTIO_VGA imply VIRTIO_VGA
imply TEST_DEVICES imply TEST_DEVICES
@ -51,6 +57,8 @@ config RISCV_VIRT
config SHAKTI_C config SHAKTI_C
bool bool
default y
depends on RISCV64
select RISCV_ACLINT select RISCV_ACLINT
select SHAKTI_UART select SHAKTI_UART
select SIFIVE_PLIC select SIFIVE_PLIC
@ -58,6 +66,8 @@ config SHAKTI_C
config SIFIVE_E config SIFIVE_E
bool bool
default y
depends on RISCV32 || RISCV64
select RISCV_ACLINT select RISCV_ACLINT
select SIFIVE_GPIO select SIFIVE_GPIO
select SIFIVE_PLIC select SIFIVE_PLIC
@ -68,6 +78,8 @@ config SIFIVE_E
config SIFIVE_U config SIFIVE_U
bool bool
default y
depends on RISCV32 || RISCV64
select CADENCE select CADENCE
select CPU_CLUSTER select CPU_CLUSTER
select RISCV_ACLINT select RISCV_ACLINT
@ -85,6 +97,8 @@ config SIFIVE_U
config SPIKE config SPIKE
bool bool
default y
depends on RISCV32 || RISCV64
select RISCV_NUMA select RISCV_NUMA
select HTIF select HTIF
select RISCV_ACLINT select RISCV_ACLINT